diff --git a/meow-core.el b/meow-core.el index 3fd662a..e3563e5 100644 --- a/meow-core.el +++ b/meow-core.el @@ -72,7 +72,6 @@ (when meow-keypad-mode (setq meow--prefix-arg current-prefix-arg meow--keypad-keymap-description-activated nil - meow--keypad-allow-quick-dispatch t meow--keypad-base-keymap nil meow--use-literal nil meow--use-meta nil diff --git a/meow-keypad.el b/meow-keypad.el index e0670ba..491d33c 100644 --- a/meow-keypad.el +++ b/meow-keypad.el @@ -414,7 +414,7 @@ try replacing the last modifier and try again." meow--use-meta meow--use-both) (let* ((key-str (meow--keypad-format-keys nil)) - (cmd (key-binding (kbd key-str)))) + (cmd (meow--keypad-lookup-key (kbd key-str)))) (cond ((commandp cmd t) (setq current-prefix-arg meow--prefix-arg @@ -491,13 +491,11 @@ Return t if handling is completed." (push (cons 'control (meow--parse-input-event (alist-get input-event meow-keypad-start-keys))) meow--keypad-keys)) - (meow--keypad-allow-quick-dispatch + (t (if-let* ((keymap (meow--get-leader-keymap))) (setq meow--keypad-base-keymap keymap) (setq meow--keypad-keys (meow--parse-string-to-keypad-keys meow-keypad-leader-dispatch))) - (push (cons 'literal key) meow--keypad-keys)) - (t - (push (cons 'control key) meow--keypad-keys)))) + (push (cons 'literal key) meow--keypad-keys)))) ;; Try execute if the input is valid. (if (or meow--use-literal diff --git a/meow-var.el b/meow-var.el index e7047da..1533af3 100644 --- a/meow-var.el +++ b/meow-var.el @@ -374,7 +374,6 @@ Use (setq meow-keypad-describe-keymap-function \\='nil) to disable popup.") (defvar meow--keypad-keys nil) (defvar meow--keypad-previous-state nil) -(defvar meow--keypad-allow-quick-dispatch nil) (defvar meow--prefix-arg nil) (defvar meow--use-literal nil)