diff options
| -rw-r--r-- | modules/textadept/command_entry.lua | 5 | ||||
| -rw-r--r-- | test/test.lua | 10 |
2 files changed, 14 insertions, 1 deletions
diff --git a/modules/textadept/command_entry.lua b/modules/textadept/command_entry.lua index 86f65ba5..29bea5b0 100644 --- a/modules/textadept/command_entry.lua +++ b/modules/textadept/command_entry.lua @@ -162,6 +162,8 @@ end -- @name lua_keys local lua_keys = {['\t'] = complete_lua} +local prev_key_mode + --- -- Opens the command entry, subjecting it to any key bindings defined in table -- *keys*, highlighting text with lexer name *lexer*, and displaying @@ -217,6 +219,7 @@ function M.run(f, keys, lexer, height) local mode_history = history[history.mode] M:set_text(mode_history and mode_history[mode_history.pos] or '') M:select_all() + prev_key_mode = _G.keys.mode M.focus() M:set_lexer(lexer or 'text') M.height = M:text_height(1) * (height or 1) @@ -226,7 +229,7 @@ end -- Redefine ui.command_entry.focus() to clear any current key mode on hide/show. local orig_focus = M.focus M.focus = function() - keys.mode = nil + keys.mode = prev_key_mode orig_focus() end diff --git a/test/test.lua b/test/test.lua index e67f02ae..b27329fa 100644 --- a/test/test.lua +++ b/test/test.lua @@ -1242,6 +1242,16 @@ function test_command_entry_history() events.emit(events.KEYPRESS, not CURSES and 0xFF1B or 7) -- esc end +function test_command_entry_mode_restore() + local mode = 'test_mode' + keys.mode = mode + ui.command_entry.run(nil) + assert(keys.mode ~= mode) + events.emit(events.KEYPRESS, not CURSES and 0xFF0D or 343) -- \n + assert_equal(keys.mode, mode) + keys.mode = nil +end + function test_editing_auto_pair() buffer.new() -- Single selection. |