[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 0b2739a 27/39: Fix display of meta bindings in which-key-s
From: |
Justin Burkett |
Subject: |
[elpa] master 0b2739a 27/39: Fix display of meta bindings in which-key-show-keymap |
Date: |
Thu, 21 Jun 2018 15:48:16 -0400 (EDT) |
branch: master
commit 0b2739a2bedfb117afc39e9101bdd2ec0a120897
Author: Justin Burkett <address@hidden>
Commit: Justin Burkett <address@hidden>
Fix display of meta bindings in which-key-show-keymap
---
which-key.el | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/which-key.el b/which-key.el
index a6a4c3e..c76b653 100644
--- a/which-key.el
+++ b/which-key.el
@@ -1687,20 +1687,27 @@ ones. PREFIX is for internal use and should not be
used."
(lambda (ev def)
(let* ((key (append prefix (list ev)))
(key-desc (key-description key)))
- (unless (string-match-p which-key--ignore-keys-regexp key-desc)
- (if (and all (keymapp def))
+ (unless (or (string-match-p which-key--ignore-keys-regexp key-desc)
+ (eq ev 'menu-bar))
+ (if (and (keymapp def)
+ (or all
+ ;; event 27 is escape, so this will pick up meta
+ ;; bindings and hopefully not too much more
+ (and (numberp ev) (= ev 27))))
(setq bindings
(append bindings
(which-key--get-keymap-bindings def t key)))
- (cl-pushnew
- (cons key-desc
- (cond
- ((keymapp def) "Prefix Command")
- ((symbolp def) (copy-sequence (symbol-name def)))
- ((eq 'lambda (car-safe def)) "lambda")
- ((eq 'menu-item (car-safe def)) "menu-item")
- (t (format "%s" def))))
- bindings :test (lambda (a b) (string= (car a) (car b))))))))
+ (when def
+ (cl-pushnew
+ (cons key-desc
+ (cond
+ ((keymapp def) "Prefix Command")
+ ((symbolp def) (copy-sequence (symbol-name def)))
+ ((eq 'lambda (car-safe def)) "lambda")
+ ((eq 'menu-item (car-safe def)) "menu-item")
+ ((stringp def) def)
+ (t "unknown")))
+ bindings :test (lambda (a b) (string= (car a) (car b)))))))))
keymap)
bindings))
- [elpa] master d19fe4e 30/39: Fix switching to top-level from which-key-undo-key, (continued)
- [elpa] master d19fe4e 30/39: Fix switching to top-level from which-key-undo-key, Justin Burkett, 2018/06/21
- [elpa] master 9dc8d32 20/39: Add which-key-toggle-docstrings, Justin Burkett, 2018/06/21
- [elpa] master 206be7a 33/39: Fix behavior of f and t in evil operator map, Justin Burkett, 2018/06/21
- [elpa] master e97253b 24/39: Add prefix arg to which-key--get-current-bindings and .., Justin Burkett, 2018/06/21
- [elpa] master ded908e 25/39: Remove which-key--current-prefix, Justin Burkett, 2018/06/21
- [elpa] master 013681a 28/39: Fixes related to removal of which-key--current-prefix, Justin Burkett, 2018/06/21
- [elpa] master ff79dff 38/39: Version 3.3.0, Justin Burkett, 2018/06/21
- [elpa] master 4042f06 34/39: Fix prefix bindings in which-key-show-major-mode, Justin Burkett, 2018/06/21
- [elpa] master 0dc4e84 36/39: Use window-size-change-functions for detecting size changes, Justin Burkett, 2018/06/21
- [elpa] master ab60391 21/39: Use cl-struct to hold which-key pages, Justin Burkett, 2018/06/21
- [elpa] master 0b2739a 27/39: Fix display of meta bindings in which-key-show-keymap,
Justin Burkett <=
- [elpa] master f77d421 19/39: Consolidate key binding collection into which-key--get-bindings, Justin Burkett, 2018/06/21
- [elpa] master 4370658 29/39: Factor out which-key--this-command-keys function, Justin Burkett, 2018/06/21
- [elpa] master a4095e8 37/39: Fix handling of duplicate (evil) bindings in show keymap, Justin Burkett, 2018/06/21
- [elpa] master f251541 18/39: Refactor show keymap functions, Justin Burkett, 2018/06/21
- [elpa] master 8a878de 32/39: Version 3.2.0, Justin Burkett, 2018/06/21
- [elpa] master 2c91540 35/39: Add support for evil's auxiliary maps in show-keymap functions, Justin Burkett, 2018/06/21
- [elpa] master bc97659 31/39: Fix and improve defcustoms, Justin Burkett, 2018/06/21
- [elpa] master ed7aa66 23/39: Remove a bunch of global variables, Justin Burkett, 2018/06/21
- [elpa] master fb09d75 39/39: Merge commit 'ff79dfff66f880885c5893dd6fd05dc51173a476', Justin Burkett, 2018/06/21