aboutsummaryrefslogtreecommitdiff
path: root/modules/textadept
diff options
context:
space:
mode:
authormitchell <70453897+667e-11@users.noreply.github.com>2013-06-24 15:33:41 -0400
committermitchell <70453897+667e-11@users.noreply.github.com>2013-06-24 15:33:41 -0400
commit8527adcebc33243664bcb2b19d63ac6a66e584be (patch)
treec0dae28fa47a8b0178420f4d65a44842d1e2a204 /modules/textadept
parent9eac2fc9173845e73c8e55aec9be66c9a233da2d (diff)
downloadtextadept-8527adcebc33243664bcb2b19d63ac6a66e584be.tar.gz
textadept-8527adcebc33243664bcb2b19d63ac6a66e584be.zip
Removed `_G.RESETTING`; test for `arg` instead.
Diffstat (limited to 'modules/textadept')
-rw-r--r--modules/textadept/keys.lua3
-rw-r--r--modules/textadept/mime_types.lua3
2 files changed, 2 insertions, 4 deletions
diff --git a/modules/textadept/keys.lua b/modules/textadept/keys.lua
index 810d6ee0..d0b161d1 100644
--- a/modules/textadept/keys.lua
+++ b/modules/textadept/keys.lua
@@ -290,8 +290,7 @@ local function constantize_menu_buffer_functions()
for _, f in ipairs(menu_buffer_functions) do buffer[f] = buffer[f] end
end
events.connect(events.BUFFER_NEW, constantize_menu_buffer_functions)
--- Scintilla's first buffer does not have this.
-if not RESETTING then constantize_menu_buffer_functions() end
+constantize_menu_buffer_functions() -- for the first buffer
local _M, keys, buffer, view = _M, keys, buffer, view
local m_editing, utils = _M.textadept.editing, M.utils
diff --git a/modules/textadept/mime_types.lua b/modules/textadept/mime_types.lua
index be21824e..19b5fcbc 100644
--- a/modules/textadept/mime_types.lua
+++ b/modules/textadept/mime_types.lua
@@ -110,8 +110,7 @@ local function set_lexer_functions()
buffer.get_style_name = get_style_name
end
events.connect(events.BUFFER_NEW, set_lexer_functions, 1)
--- Scintilla's first buffer does not have these.
-if not RESETTING then set_lexer_functions() end
+set_lexer_functions() -- for the first buffer
-- Auto-detect lexer on file open or save as.
events.connect(events.FILE_OPENED, function() buffer:set_lexer() end)