[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master a4095e8 37/39: Fix handling of duplicate (evil) bindings i
From: |
Justin Burkett |
Subject: |
[elpa] master a4095e8 37/39: Fix handling of duplicate (evil) bindings in show keymap |
Date: |
Thu, 21 Jun 2018 15:48:18 -0400 (EDT) |
branch: master
commit a4095e8ee6f932e049cebd90ab41b95b869ce3e4
Author: Justin Burkett <address@hidden>
Commit: Justin Burkett <address@hidden>
Fix handling of duplicate (evil) bindings in show keymap
---
which-key.el | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/which-key.el b/which-key.el
index e4c372d..29b38f0 100644
--- a/which-key.el
+++ b/which-key.el
@@ -1707,8 +1707,12 @@ ones. PREFIX is for internal use and should not be used."
(bound-and-true-p evil-local-mode)
(string-match-p (format "<%s-state>$" evil-state)
key-desc))
(setq bindings
- (append bindings
- (which-key--get-keymap-bindings def all
prefix))))
+ ;; this function keeps the latter of the two duplicates
+ ;; which will be the evil binding
+ (cl-remove-duplicates
+ (append bindings
+ (which-key--get-keymap-bindings def all prefix))
+ :test (lambda (a b) (string= (car a) (car b))))))
((and (keymapp def)
(string-match-p which-key--evil-keys-regexp key-desc)))
((and (keymapp def)
- [elpa] master e97253b 24/39: Add prefix arg to which-key--get-current-bindings and .., (continued)
- [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, 2018/06/21
- [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 <=
- [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