Skip to content

Commit a159b74

Browse files
committed
ci: don't load which-key-mode if included in emacs 30
1 parent 78e4b87 commit a159b74

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

meow-shims.el

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -386,21 +386,23 @@ Argument ENABLE non-nil means turn on."
386386
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
387387
;; which-key
388388

389-
(defvar which-key-mode)
390-
(declare-function which-key--create-buffer-and-show "which-key"
391-
(&optional prefix-keys from-keymap filter prefix-title))
389+
(unless (functionp 'which-key-mode)
390+
(defvar which-key-mode)
391+
(declare-function which-key--create-buffer-and-show "which-key"
392+
(&optional prefix-keys from-keymap filter prefix-title))
392393

393-
(defvar meow--which-key-setup nil)
394+
(defvar meow--which-key-setup nil)
395+
(defvar which-key-use-C-h-commands))
394396

395397
(defun meow--which-key-describe-keymap ()
396398
"Use which-key for keypad popup."
397399
(if which-key-mode
398400
(setq
399401
which-key-use-C-h-commands nil
400402
meow-keypad-describe-keymap-function
401-
(lambda (keymap)
402-
(which-key--create-buffer-and-show nil keymap nil (concat meow-keypad-message-prefix (meow--keypad-format-keys))))
403-
meow-keypad-clear-describe-keymap-function 'which-key--hide-popup)
403+
(lambda (keymap)
404+
(which-key--create-buffer-and-show nil keymap nil (concat meow-keypad-message-prefix (meow--keypad-format-keys))))
405+
meow-keypad-clear-describe-keymap-function 'which-key--hide-popup)
404406

405407
(setq meow-keypad-describe-keymap-function 'meow-describe-keymap
406408
meow-keypad-clear-describe-keymap-function nil

0 commit comments

Comments
 (0)