diff options
-rw-r--r-- | core/events.lua | 4 | ||||
-rw-r--r-- | modules/textadept/snippets.lua | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/core/events.lua b/core/events.lua index ab918fa4..2173ea4b 100644 --- a/core/events.lua +++ b/core/events.lua @@ -361,13 +361,13 @@ end) -- Set event constants. for _, n in pairs(scnotifications) do M[n[1]:upper()] = n[1] end -local ta_events = { +local textadept_events = { 'appleevent_odoc', 'buffer_after_switch', 'buffer_before_switch', 'buffer_deleted', 'buffer_new', 'csi', 'error', 'find', 'focus', 'initialized', 'keypress', 'menu_clicked', 'mouse', 'quit', 'replace', 'replace_all', 'reset_after', 'reset_before', 'resume', 'suspend', 'view_after_switch', 'view_before_switch', 'view_new' } -for _, e in pairs(ta_events) do M[e:upper()] = e end +for _, e in pairs(textadept_events) do M[e:upper()] = e end return M diff --git a/modules/textadept/snippets.lua b/modules/textadept/snippets.lua index d1019dfb..2d4bc1de 100644 --- a/modules/textadept/snippets.lua +++ b/modules/textadept/snippets.lua @@ -352,8 +352,10 @@ function M._select() for trigger, text in pairs(snippets) do if type(text) == 'string' then list[#list + 1] = trigger..'|'..text end end - for trigger, text in pairs(snippets[buffer:get_lexer(true)] or {}) do - if type(text) == 'string' then list[#list + 1] = trigger..'|'..text end + if snippets[buffer:get_lexer(true)] then + for trigger, text in pairs(snippets[buffer:get_lexer(true)]) do + if type(text) == 'string' then list[#list + 1] = trigger..'|'..text end + end end table.sort(list) for i = 1, #list do |