branch: elpa/meow
commit e5817f3b5ef82cbcf8a729af205191dc6b142282
Author: esrh <e...@esrh.me>
Commit: esrh <e...@esrh.me>
Revert "ci: don't load which-key-mode if included in emacs 30"
This reverts commit a159b743d2b3c4fa17d13e90a4c753325c320afa.
---
meow-shims.el | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/meow-shims.el b/meow-shims.el
index a3cfd114b7..9ebcca6c19 100644
--- a/meow-shims.el
+++ b/meow-shims.el
@@ -386,13 +386,11 @@ Argument ENABLE non-nil means turn on."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; which-key
-(unless (functionp 'which-key-mode)
- (defvar which-key-mode)
- (declare-function which-key--create-buffer-and-show "which-key"
- (&optional prefix-keys from-keymap filter prefix-title))
+(defvar which-key-mode)
+(declare-function which-key--create-buffer-and-show "which-key"
+ (&optional prefix-keys from-keymap filter prefix-title))
- (defvar meow--which-key-setup nil)
- (defvar which-key-use-C-h-commands))
+(defvar meow--which-key-setup nil)
(defun meow--which-key-describe-keymap ()
"Use which-key for keypad popup."
@@ -400,9 +398,9 @@ Argument ENABLE non-nil means turn on."
(setq
which-key-use-C-h-commands nil
meow-keypad-describe-keymap-function
- (lambda (keymap)
- (which-key--create-buffer-and-show nil keymap nil (concat
meow-keypad-message-prefix (meow--keypad-format-keys))))
- meow-keypad-clear-describe-keymap-function 'which-key--hide-popup)
+ (lambda (keymap)
+ (which-key--create-buffer-and-show nil keymap nil (concat
meow-keypad-message-prefix (meow--keypad-format-keys))))
+ meow-keypad-clear-describe-keymap-function 'which-key--hide-popup)
(setq meow-keypad-describe-keymap-function 'meow-describe-keymap
meow-keypad-clear-describe-keymap-function nil
