branch: elpa/bind-map
commit 988f14eb77baeeaa7440defd27b38e517e111f08
Author: justbur <jus...@burkett.cc>
Commit: justbur <jus...@burkett.cc>
Use evil-define-minor-mode-key for minor-mode keys
---
bind-map.el | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/bind-map.el b/bind-map.el
index da4b62a2e3..4070d68864 100644
--- a/bind-map.el
+++ b/bind-map.el
@@ -296,8 +296,14 @@ mode maps. Set up by bind-map.el." map))
(define-key ,root-map key ',prefix-cmd))
(dolist (key (bind-map-kbd-keys (list ,@evil-keys)))
(dolist (state ',evil-states)
- (define-key (evil-get-auxiliary-keymap ,root-map state t)
- key ',prefix-cmd))))
+ (when ',major-modes
+ (define-key
+ (evil-get-auxiliary-keymap ,root-map state t)
+ key ',prefix-cmd))
+ (dolist (mode ',minor-modes)
+ (when (fboundp 'evil-define-minor-mode-key)
+ (evil-define-minor-mode-key
+ state mode key ',prefix-cmd))))))
;; bind in global maps and possibly root-map
`((dolist (key (bind-map-kbd-keys (list ,@keys)))
(when ,override-minor-modes
