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

Use new evil-collection blacklist instead of hook

Browse source
This commit is contained in:
Henrik Lissner 2018-06-15 16:08:23 +02:00
parent 588359cc5f
commit 9e54e393ea
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 3 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

19
modules/config/default/+bindings.el
View file

@ -794,20 +794,7 @@
(after! ivy (+default|fix-minibuffer-in-map ivy-minibuffer-map)) (after! ivy (+default|fix-minibuffer-in-map ivy-minibuffer-map))
;;
;; Evil-collection fixes ;; Evil-collection fixes
;; (setq evil-collection-key-blacklist
(list "C-j" "C-k" "gd" "gf" "K" "[" "]"
(defun +config|deal-with-evil-collections-bs (_feature keymaps) doom-leader-key doom-localleader-key))
"Unmap keys that conflict with Doom's defaults."
(dolist (map keymaps)
(evil-delay `(and (boundp ',map) (keymapp ,map))
`(evil-define-key* '(normal visual motion) ,map
(kbd doom-leader-key) nil
(kbd "C-j") nil (kbd "C-k") nil
"gd" nil "gf" nil "K" nil
"]" nil "[" nil)
'after-load-functions t nil
(format "+default-redefine-key-in-%s" map))))
(add-hook 'evil-collection-setup-hook #'+config|deal-with-evil-collections-bs)