5 files changed, 17 insertions, 18 deletions
diff --git a/modules/textadept/bookmarks.lua b/modules/textadept/bookmarks.lua
index c94fb256..2b95df1d 100644
--- a/modules/textadept/bookmarks.lua
+++ b/modules/textadept/bookmarks.lua
@@ -78,5 +78,5 @@ function goto_prev()
 end
 
 if buffer then buffer:marker_set_back(MARK_BOOKMARK, MARK_BOOKMARK_COLOR) end
-textadept.events.add_handler('view_new',
+events.connect('view_new',
   function() buffer:marker_set_back(MARK_BOOKMARK, MARK_BOOKMARK_COLOR) end)
diff --git a/modules/textadept/editing.lua b/modules/textadept/editing.lua
index bb53b3ad..2d1586a2 100644
--- a/modules/textadept/editing.lua
+++ b/modules/textadept/editing.lua
@@ -2,6 +2,7 @@
 
 local textadept = _G.textadept
 local locale = _G.locale
+local events = _G.events
 
 ---
 -- Editing commands for the textadept module.
@@ -73,14 +74,14 @@ local braces = { -- () [] {} <>
 -- Used for displaying call tips.
 local current_call_tip = {}
 
-textadept.events.add_handler('char_added',
+events.connect('char_added',
   function(c) -- matches characters specified in char_matches
     if AUTOPAIR and char_matches[c] and buffer.selections == 1 then
       buffer:insert_text(-1, char_matches[c])
     end
   end)
 
-textadept.events.add_handler('keypress',
+events.connect('keypress',
   function(code, shift, control, alt) -- removes matched chars on backspace
     if AUTOPAIR and code == 0xff08 and buffer.selections == 1 then
       local buffer = buffer
@@ -93,7 +94,7 @@ textadept.events.add_handler('keypress',
     end
   end)
 
-textadept.events.add_handler('update_ui',
+events.connect('update_ui',
   function() -- highlights matching braces
     local buffer = buffer
     local current_pos = buffer.current_pos
@@ -110,7 +111,7 @@ textadept.events.add_handler('update_ui',
     end
   end)
 
-textadept.events.add_handler('char_added',
+events.connect('char_added',
   function(char) -- auto-indent on return
     if not AUTOINDENT or char ~= 10 then return end
     local buffer = buffer
@@ -270,7 +271,7 @@ function prepare_for_save()
   buffer:convert_eo_ls(buffer.eol_mode)
   buffer:end_undo_action()
 end
-textadept.events.add_handler('file_before_save', prepare_for_save)
+events.connect('file_before_save', prepare_for_save)
 
 ---
 -- Cuts or copies text ranges intelligently. (Behaves like Emacs.)
diff --git a/modules/textadept/mime_types.lua b/modules/textadept/mime_types.lua
index ba7a33c3..f3265b53 100644
--- a/modules/textadept/mime_types.lua
+++ b/modules/textadept/mime_types.lua
@@ -2,6 +2,7 @@
 
 local textadept = _G.textadept
 local locale = _G.locale
+local events = _G.events
 
 ---
 -- Handles file-specific settings.
@@ -204,8 +205,7 @@ local function set_lexer(buffer, lang)
   end
   buffer:colourise(0, -1)
 end
-textadept.events.add_handler('buffer_new',
-  function() buffer.set_lexer = set_lexer end)
+events.connect('buffer_new', function() buffer.set_lexer = set_lexer end)
 -- Scintilla's first buffer doesn't have this
 if not RESETTING then buffer.set_lexer = set_lexer end
 
@@ -242,12 +242,11 @@ local function restore_lexer()
   buffer:set_lexer_language(buffer._lexer or 'container')
 end
 
-textadept.events.add_handler('file_opened', handle_new)
-textadept.events.add_handler('file_saved_as', handle_new)
-textadept.events.add_handler('buffer_after_switch', restore_lexer)
-textadept.events.add_handler('view_new', restore_lexer)
-textadept.events.add_handler('reset_after',
-  function() buffer:set_lexer(buffer._lexer) end)
+events.connect('file_opened', handle_new)
+events.connect('file_saved_as', handle_new)
+events.connect('buffer_after_switch', restore_lexer)
+events.connect('view_new', restore_lexer)
+events.connect('reset_after', function() buffer:set_lexer(buffer._lexer) end)
 
 ---
 -- Prompts the user to select a lexer from a filtered list for the current
diff --git a/modules/textadept/run.lua b/modules/textadept/run.lua
index c14e8e2d..a576ff27 100644
--- a/modules/textadept/run.lua
+++ b/modules/textadept/run.lua
@@ -130,4 +130,4 @@ function goto_error(pos, line_num)
     end
   end
 end
-textadept.events.add_handler('double_click', goto_error)
+events.connect('double_click', goto_error)
diff --git a/modules/textadept/session.lua b/modules/textadept/session.lua
index 30d9e823..3535bca1 100644
--- a/modules/textadept/session.lua
+++ b/modules/textadept/session.lua
@@ -51,7 +51,7 @@ function load(filename)
       else
         textadept.new_buffer()
         buffer._type = filename
-        textadept.events.handle('file_opened', filename)
+        events.handle('file_opened', filename)
       end
       -- Restore saved buffer selection and view.
       local anchor = tonumber(anchor) or 0
@@ -168,5 +168,4 @@ function save(filename)
   end
 end
 
-textadept.events.add_handler('quit',
-  function() if SAVE_ON_QUIT then save() end end, 1)
+events.connect('quit', function() if SAVE_ON_QUIT then save() end end, 1)