From c82a324dd9379178f55ccb351882635761474726 Mon Sep 17 00:00:00 2001 From: Zhengyi Date: Wed, 4 Dec 2024 19:24:19 +0800 Subject: [PATCH] Fix meow--keypad-try-execute (#688) (commandp cmd) returns t if cmd is an autoloaded keymap. --- meow-keypad.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meow-keypad.el b/meow-keypad.el index 491d33c..8b2c0b9 100644 --- a/meow-keypad.el +++ b/meow-keypad.el @@ -416,6 +416,10 @@ try replacing the last modifier and try again." (let* ((key-str (meow--keypad-format-keys nil)) (cmd (meow--keypad-lookup-key (kbd key-str)))) (cond + ((keymapp cmd) + (when meow-keypad-message (meow--keypad-show-message)) + (meow--keypad-display-message) + nil) ((commandp cmd t) (setq current-prefix-arg meow--prefix-arg meow--prefix-arg nil) @@ -430,10 +434,6 @@ try replacing the last modifier and try again." this-command cmd) (meow--keypad-execute cmd) t))) - ((keymapp cmd) - (when meow-keypad-message (meow--keypad-show-message)) - (meow--keypad-display-message) - nil) ((equal 'control (caar meow--keypad-keys)) (setcar meow--keypad-keys (cons 'literal (cdar meow--keypad-keys))) (meow--keypad-try-execute))