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