mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-01 19:30:45 -08:00
Code Issues Projects Releases Wiki Activity

Revert "Fix #65"

Browse source 
This reverts commit c1873df76d.
This commit is contained in:
justbur 2015-09-24 10:22:29 -04:00
parent c1873df76d
commit e5e5f7c978
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
which-key.el
View file

@ -321,8 +321,8 @@ to a non-nil value for the execution of a command. Like this
Used when `which-key-popup-type' is frame.")
(defvar which-key--echo-keystrokes-backup nil
"Internal: Backup the initial value of `echo-keystrokes'.")
;; (defvar which-key--prefix-help-cmd-backup nil
;; "Internal: Backup the value of `prefix-help-command'.")
(defvar which-key--prefix-help-cmd-backup nil
"Internal: Backup the value of `prefix-help-command'.")
(defvar which-key--pages-plist nil
"Internal: Holds page objects")
(defvar which-key--lighter-backup nil
@ -377,6 +377,7 @@ alongside the actual current key sequence when
(progn
(setq which-key--echo-keystrokes-backup echo-keystrokes)
(unless which-key--is-setup (which-key--setup))
(setq which-key--prefix-help-cmd-backup prefix-help-command)
(when which-key-use-C-h-for-paging
(setq prefix-help-command #'which-key-show-next-page))
(when which-key-show-remaining-keys
@ -386,6 +387,7 @@ alongside the actual current key sequence when
(add-hook 'focus-in-hook #'which-key--start-timer)
(which-key--start-timer))
(setq echo-keystrokes which-key--echo-keystrokes-backup)
(setq prefix-help-command which-key--prefix-help-cmd-backup)
(when which-key-show-remaining-keys
(remove-hook 'pre-command-hook #'which-key--lighter-restore))
(remove-hook 'pre-command-hook #'which-key--hide-popup)
@ -1315,7 +1317,7 @@ Will force an update if called before `which-key--update'."
(progn
(which-key--hide-popup-ignore-command)
(which-key--stop-timer)
(describe-prefix-bindings)
(funcall which-key--prefix-help-cmd-backup)
(which-key--start-timer))
(let* ((next-event-if-showing
;; forces event into current key sequence