Merge pull request #1128 from fukamachi/lem-command-keymap

Add vi-mode:*command-keymap* again.
lem-project · Oct 9, 2023 · 726b5cf · 726b5cf
2 parents 146a1ab + 2c1e61a
commit 726b5cf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/extensions/vi-mode/states.lisp b/extensions/vi-mode/states.lisp
@@ -14,6 +14,7 @@
                 :state-modeline-green
                 :change-element-by-state)
   (:export :*normal-keymap*
+           :*command-keymap*
            :*motion-keymap*
            :*insert-keymap*
            :*inactive-keymap*
@@ -43,6 +44,11 @@
 (define-keymap *outer-text-objects-keymap*)
 (define-keymap *inner-text-objects-keymap*)
 
+(define-symbol-macro *command-keymap*
+  (progn
+    (warn "*command-keymap* is deprecated. Use *normal-keymap* instead.")
+    *normal-keymap*))
+
 (defvar *inactive-keymap* (make-keymap))
 
 (define-command return-last-read-char () ()

diff --git a/extensions/vi-mode/vi-mode.lisp b/extensions/vi-mode/vi-mode.lisp
@@ -20,6 +20,7 @@
                 :insert
                 :*motion-keymap*
                 :*normal-keymap*
+                :*command-keymap*
                 :*insert-keymap*
                 :*inner-text-objects-keymap*
                 :*outer-text-objects-keymap*
@@ -40,6 +41,7 @@
            :define-text-object-command
            :*motion-keymap*
            :*normal-keymap*
+           :*command-keymap*
            :*insert-keymap*
            :*visual-keymap*
            :*operator-keymap*