[nongnu] elpa/xah-fly-keys 8fa90bea19 3/5: Merge pull request #146 from velimir/call-clearfun

[ELPA Syncer]

branch: elpa/xah-fly-keys
commit 8fa90bea1964f73ba5f8bc7a3ed005543fa5952f
Merge: 8bde45ee32 79c2afc372
Author: Xah Lee <xah@xahlee.org>
Commit: GitHub <noreply@github.com>

    Merge pull request #146 from velimir/call-clearfun
    
    make sure to clean up on xah-fly-command-mode-init subsequent calls
---
 xah-fly-keys.el | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/xah-fly-keys.el b/xah-fly-keys.el
index ca30652f09..a340e1bf12 100644
--- a/xah-fly-keys.el
+++ b/xah-fly-keys.el
@@ -4591,10 +4591,12 @@ Version: 2018-05-07"
 
 (defun xah-fly-command-mode-init ()
   "Set command mode keys.
-Version: 2020-04-28"
+Version: 2022-07-06"
   (interactive)
   (setq xah-fly-insert-state-p nil)
   (xah-fly--update-key-map)
+  (when xah-fly--deactivate-command-mode-func
+    (funcall xah-fly--deactivate-command-mode-func))
   (setq xah-fly--deactivate-command-mode-func
         (set-transient-map xah-fly-command-map (lambda () t)))
   (modify-all-frames-parameters (list (cons 'cursor-type 'box)))
@@ -4706,14 +4708,6 @@ URL `http://xahlee.info/emacs/misc/xah-fly-keys.html'"
       ;;
       )))
 
-(when (= emacs-major-version 28)
-  ;; 2022-06-14 fix a emacs 28.1 bug.
-  ;; clear-transient-map bug
-  ;; http://xahlee.info/emacs/emacs/clear-transient-map_bug.html
-  (progn
-    (defun xah-clear-pre-command-hook () (setq pre-command-hook nil))
-    (add-hook 'xah-fly-insert-mode-activate-hook 'xah-clear-pre-command-hook)))
-
 (provide 'xah-fly-keys)
 
 ;; Local Variables: