branch: externals/which-key
commit 3908719ff2cf45ef886fa484af0cf8a81e95c9aa
Author: Daniel Mendler <[email protected]>
Commit: Daniel Mendler <[email protected]>
simplify pseudo key
---
which-key.el | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/which-key.el b/which-key.el
index de1aa67..b2635ea 100644
--- a/which-key.el
+++ b/which-key.el
@@ -677,12 +677,12 @@ update.")
(defvar which-key--ignore-non-evil-keys-regexp
(eval-when-compile
(regexp-opt '("mouse-" "wheel-" "remap" "drag-" "scroll-bar"
- "select-window" "switch-frame" "which-key-"))))
+ "select-window" "switch-frame" "which-key"))))
(defvar which-key--ignore-keys-regexp
(eval-when-compile
(regexp-opt '("mouse-" "wheel-" "remap" "drag-" "scroll-bar"
"select-window" "switch-frame" "-state"
- "which-key-"))))
+ "which-key"))))
(make-obsolete-variable 'which-key-prefix-name-alist nil "2016-10-05")
(make-obsolete-variable 'which-key-prefix-title-alist nil "2016-10-05")
@@ -1595,11 +1595,8 @@ which are strings. KEY is of the form produced by
`key-binding'."
(defun which-key--pseudo-key (key &optional prefix)
"Replace the last key in the sequence KEY by a special symbol
in order for which-key to allow looking up a description for the key."
- (let* ((seq (listify-key-sequence key))
- (final (intern (format "which-key-%s" (key-description (last seq))))))
- (if prefix
- (vconcat prefix (list final))
- (vconcat (butlast seq) (list final)))))
+ (let ((seq (listify-key-sequence key)))
+ (vconcat (or prefix (butlast seq)) (vector 'which-key (last seq)))))
(defun which-key--maybe-get-prefix-title (keys)
"KEYS is a string produced by `key-description'.
