3 files changed, 10 insertions, 7 deletions
diff --git a/modules/textadept/command_entry.lua b/modules/textadept/command_entry.lua
index 168b53f5..8665e3fd 100644
--- a/modules/textadept/command_entry.lua
+++ b/modules/textadept/command_entry.lua
@@ -112,7 +112,7 @@ local function run_lua(code)
     end
   end
   if result ~= nil or code:find('^return ') then ui.print(result) end
-  events.emit(events.UPDATE_UI)
+  events.emit(events.UPDATE_UI, 0)
 end
 args.register('-e', '--execute', 1, run_lua, 'Execute Lua code')
 
diff --git a/modules/textadept/menu.lua b/modules/textadept/menu.lua
index ed1cd763..153e25b9 100644
--- a/modules/textadept/menu.lua
+++ b/modules/textadept/menu.lua
@@ -29,16 +29,16 @@ local sel_enc = textadept.editing.select_enclosed
 local enc = textadept.editing.enclose
 local function set_indentation(i)
   buffer.tab_width = i
-  events.emit(events.UPDATE_UI) -- for updating statusbar
+  events.emit(events.UPDATE_UI, 0) -- for updating statusbar
 end
 local function set_eol_mode(mode)
   buffer.eol_mode = mode
   buffer:convert_eols(mode)
-  events.emit(events.UPDATE_UI) -- for updating statusbar
+  events.emit(events.UPDATE_UI, 0) -- for updating statusbar
 end
 local function set_encoding(encoding)
   buffer:set_encoding(encoding)
-  events.emit(events.UPDATE_UI) -- for updating statusbar
+  events.emit(events.UPDATE_UI, 0) -- for updating statusbar
 end
 local function open_page(url)
   local cmd = (WIN32 and 'start ""') or (OSX and 'open') or 'xdg-open'
@@ -275,7 +275,7 @@ local default_menubar = {
       SEPARATOR,
       {_L['Toggle Use Tabs'], function()
         buffer.use_tabs = not buffer.use_tabs
-        events.emit(events.UPDATE_UI) -- for updating statusbar
+        events.emit(events.UPDATE_UI, 0) -- for updating statusbar
       end},
       {_L['Convert Indentation'], textadept.editing.convert_indentation}
     },
diff --git a/modules/textadept/snippets.lua b/modules/textadept/snippets.lua
index 9e1cc9dd..90617a2d 100644
--- a/modules/textadept/snippets.lua
+++ b/modules/textadept/snippets.lua
@@ -643,8 +643,11 @@ end
 
 -- Update snippet transforms when text is added or deleted.
 events.connect(events.UPDATE_UI, function(updated)
-  if #snippet_stack > 0 and updated and updated & buffer.UPDATE_CONTENT > 0 then
-    snippet_stack[#snippet_stack]:update_transforms()
+  if #snippet_stack > 0 then
+    if updated & buffer.UPDATE_CONTENT > 0 then
+      snippet_stack[#snippet_stack]:update_transforms()
+    end
+    if #keys.keychain == 0 then ui.statusbar_text = _L['Snippet active'] end
   end
 end)