aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/locale.conf2
-rw-r--r--core/locales/locale.ar.conf2
-rw-r--r--core/locales/locale.de.conf2
-rw-r--r--core/locales/locale.es.conf2
-rw-r--r--core/locales/locale.fr.conf2
-rw-r--r--core/locales/locale.it.conf2
-rw-r--r--core/locales/locale.pl.conf2
-rw-r--r--core/locales/locale.ru.conf2
-rw-r--r--core/locales/locale.sv.conf2
-rw-r--r--core/locales/locale.zh.conf2
-rw-r--r--core/ui.lua4
-rw-r--r--modules/textadept/command_entry.lua2
-rw-r--r--modules/textadept/menu.lua8
-rw-r--r--modules/textadept/snippets.lua7
14 files changed, 32 insertions, 9 deletions
diff --git a/core/locale.conf b/core/locale.conf
index ea100822..e461f12f 100644
--- a/core/locale.conf
+++ b/core/locale.conf
@@ -356,3 +356,5 @@ Save Session = Save Session
Select Snippet = Select Snippet
Trigger = Trigger
Snippet Text = Snippet Text
+# The message displayed in the statusbar while a snippet is being inserted.
+Snippet active = Snippet active
diff --git a/core/locales/locale.ar.conf b/core/locales/locale.ar.conf
index 32a82f20..d1cf7408 100644
--- a/core/locales/locale.ar.conf
+++ b/core/locales/locale.ar.conf
@@ -356,3 +356,5 @@ Save Session = احفظ الجلسة
Select Snippet = اختر قصاصة
Trigger = الدافع
Snippet Text = نص القصاصة
+# The message displayed in the statusbar while a snippet is being inserted.
+Snippet active = Snippet active
diff --git a/core/locales/locale.de.conf b/core/locales/locale.de.conf
index 2207fe6e..d94cfe3c 100644
--- a/core/locales/locale.de.conf
+++ b/core/locales/locale.de.conf
@@ -356,3 +356,5 @@ Save Session = Session speichern
Select Snippet = Snippet auswählen
Trigger = Trigger
Snippet Text = Snippet-Text
+# The message displayed in the statusbar while a snippet is being inserted.
+Snippet active = Snippet active
diff --git a/core/locales/locale.es.conf b/core/locales/locale.es.conf
index 68de3735..299a517b 100644
--- a/core/locales/locale.es.conf
+++ b/core/locales/locale.es.conf
@@ -356,3 +356,5 @@ Save Session = Guardar sesión
Select Snippet = Seleccionar fragmento
Trigger = Disparador
Snippet Text = Texto del fragmento
+# The message displayed in the statusbar while a snippet is being inserted.
+Snippet active = Snippet active
diff --git a/core/locales/locale.fr.conf b/core/locales/locale.fr.conf
index ec72f531..4468e16b 100644
--- a/core/locales/locale.fr.conf
+++ b/core/locales/locale.fr.conf
@@ -357,3 +357,5 @@ Save Session = Enregistrer la session
Select Snippet = Choisir le fragment
Trigger = Déclencheur
Snippet Text = Texte du fragment
+# The message displayed in the statusbar while a snippet is being inserted.
+Snippet active = Snippet active
diff --git a/core/locales/locale.it.conf b/core/locales/locale.it.conf
index 1faf8045..dcd1dc64 100644
--- a/core/locales/locale.it.conf
+++ b/core/locales/locale.it.conf
@@ -356,3 +356,5 @@ Save Session = Salva la sessione
Select Snippet = Inserisci un frammento
Trigger = Innesco
Snippet Text = Testo del frammento
+# The message displayed in the statusbar while a snippet is being inserted.
+Snippet active = Snippet active
diff --git a/core/locales/locale.pl.conf b/core/locales/locale.pl.conf
index dbae0312..351d3637 100644
--- a/core/locales/locale.pl.conf
+++ b/core/locales/locale.pl.conf
@@ -357,3 +357,5 @@ Save Session = Zapisz sesję
Select Snippet = Wybierz skrawek
Trigger = Wyzwalacz
Snippet Text = Treść skrawka
+# The message displayed in the statusbar while a snippet is being inserted.
+Snippet active = Snippet active
diff --git a/core/locales/locale.ru.conf b/core/locales/locale.ru.conf
index a1ad36ab..50eec40c 100644
--- a/core/locales/locale.ru.conf
+++ b/core/locales/locale.ru.conf
@@ -356,3 +356,5 @@ Save Session = Сохранить сессию
Select Snippet = Выбрать заготовку
Trigger = Триггер
Snippet Text = Текст заготовки
+# The message displayed in the statusbar while a snippet is being inserted.
+Snippet active = Snippet active
diff --git a/core/locales/locale.sv.conf b/core/locales/locale.sv.conf
index 691dce71..1b3d3196 100644
--- a/core/locales/locale.sv.conf
+++ b/core/locales/locale.sv.conf
@@ -356,3 +356,5 @@ Save Session = Spara session
Select Snippet = Välj snippet
Trigger = Trigger
Snippet Text = Snippet-text
+# The message displayed in the statusbar while a snippet is being inserted.
+Snippet active = Snippet active
diff --git a/core/locales/locale.zh.conf b/core/locales/locale.zh.conf
index d38fb2fb..99cf57c5 100644
--- a/core/locales/locale.zh.conf
+++ b/core/locales/locale.zh.conf
@@ -356,3 +356,5 @@ Save Session = 保存会话
Select Snippet = 选择片段
Trigger = 触发
Snippet Text = 片段文本
+# The message displayed in the statusbar while a snippet is being inserted.
+Snippet active = Snippet active
diff --git a/core/ui.lua b/core/ui.lua
index 21217609..8e0900fa 100644
--- a/core/ui.lua
+++ b/core/ui.lua
@@ -284,7 +284,7 @@ end
local events, events_connect = events, events.connect
-- Ensure title, statusbar, etc. are updated for new views.
-events_connect(events.VIEW_NEW, function() events.emit(events.UPDATE_UI) end)
+events_connect(events.VIEW_NEW, function() events.emit(events.UPDATE_UI, 0) end)
-- Switches between buffers when a tab is clicked.
events_connect(
@@ -377,7 +377,7 @@ end)
-- Updates titlebar and statusbar.
local function update_bars()
set_title()
- events.emit(events.UPDATE_UI)
+ events.emit(events.UPDATE_UI, 0)
end
events_connect(events.BUFFER_NEW, update_bars)
events_connect(events.BUFFER_AFTER_SWITCH, update_bars)
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)