emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move common evil-collection-key-blacklist entries to editor/evil

Browse source
This commit is contained in:
Henrik Lissner 2019-10-21 06:16:43 -04:00
parent 74cad2632b
commit 65dcd901a0
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/config/default/+evil-bindings.el
View file

@ -3,10 +3,8 @@
;; This file defines a Spacemacs-esque keybinding scheme ;; This file defines a Spacemacs-esque keybinding scheme
;; Don't let evil-collection interfere with certain keys ;; Don't let evil-collection interfere with certain keys
(setq evil-collection-key-blacklist (appendq! evil-collection-key-blacklist
(list "gd" "gf" "K" "[" "]" "gz" "<escape>" '("gd" "gf" "K" "[" "]" "gz" "<escape>"))
doom-leader-key doom-localleader-key
doom-leader-alt-key doom-localleader-alt-key))
(defadvice! +default-evil-collection-disable-blacklist-a (orig-fn) (defadvice! +default-evil-collection-disable-blacklist-a (orig-fn)
:around #'evil-collection-vterm-toggle-send-escape ; allow binding to ESC :around #'evil-collection-vterm-toggle-send-escape ; allow binding to ESC

5
modules/editor/evil/+everywhere.el
View file

@ -226,6 +226,11 @@ and complains if a module is loaded too early (during startup)."
"q" #'kill-current-buffer "q" #'kill-current-buffer
"d" #'process-menu-delete-process) "d" #'process-menu-delete-process)
;; Don't overwrite the leader keys
(setq evil-collection-key-blacklist
(list doom-leader-key doom-localleader-key
doom-leader-alt-key doom-localleader-alt-key))
;; Load the rest ;; Load the rest
(dolist (mode evil-collection-mode-list) (dolist (mode evil-collection-mode-list)
(dolist (req (or (cdr-safe mode) (list mode))) (dolist (req (or (cdr-safe mode) (list mode)))