From effc636745e8d9c680c3acf42e8e25eed10cd903 Mon Sep 17 00:00:00 2001
From: mitchell <70453897+667e-11@users.noreply.github.com>
Date: Sun, 24 May 2020 15:39:17 -0400
Subject: Restore prior key mode after running the command entry.

---
 modules/textadept/command_entry.lua | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'modules')

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
 
-- 
cgit v1.2.3