Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix paging with God mode #247

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix paging with God mode #247

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d90ea15
Use nadvice.el instead of advice.el
darth10 May 29, 2020
3af8606
Fix paging when used with God mode
darth10 Jun 15, 2020
499442d
Stop timer to prevent which-key--hide-popup call
darth10 Jun 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 26 additions & 12 deletions which-key.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,28 +763,42 @@ problems at github.")
(defvar which-key--god-mode-key-string nil
"Holds key string to use for god-mode support.")

(defadvice god-mode-lookup-command
(around which-key--god-mode-lookup-command-advice disable)
(setq which-key--god-mode-key-string (ad-get-arg 0))
(defun which-key--god-mode-lookup-command-advice (orig-fn &rest args)
"Advice function for `god-mode-lookup-command'."
(setq which-key--god-mode-key-string (car args))
(unwind-protect
ad-do-it
(apply orig-fn args)
(when (bound-and-true-p which-key-mode)
(which-key--hide-popup))))

(defun which-key--god-mode-help-char-dispatch (orig-fn &rest args)
"Advice function for `god-mode-help-char-dispatch'."
(if (not (which-key--popup-showing-p))
(apply orig-fn args)
(which-key--stop-timer)
(which-key-C-h-dispatch)
;; Discard last prefix input. `discard-input' cannot be used
;; here as it ends any macro being defined.
(setq unread-command-events nil)
;; Return keys entered so far to prevent quitting current key
;; sequence.
(cadr args)))

(defun which-key-enable-god-mode-support (&optional disable)
"Enable support for god-mode if non-nil. This is experimental,
so you need to explicitly opt-in for now. Please report any
problems at github. If DISABLE is non-nil disable support."
(interactive "P")
(setq which-key--god-mode-support-enabled (null disable))
(if disable
(ad-disable-advice
'god-mode-lookup-command
'around 'which-key--god-mode-lookup-command-advice)
(ad-enable-advice
'god-mode-lookup-command
'around 'which-key--god-mode-lookup-command-advice))
(ad-activate 'god-mode-lookup-command))
(cond (which-key--god-mode-support-enabled
(advice-add 'god-mode-lookup-command
:around #'which-key--god-mode-lookup-command-advice)
(advice-add 'god-mode-help-char-dispatch
:around #'which-key--god-mode-help-char-dispatch))
(t (advice-remove 'god-mode-lookup-command
#'which-key--god-mode-lookup-command-advice)
(advice-remove 'god-mode-help-char-dispatch
#'which-key--god-mode-help-char-dispatch))))

;;; Mode

Expand Down