From fe235c341db0bec93512dcc83a8d57c3070e49fe Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 26 Jun 2018 18:43:27 +0200 Subject: [PATCH] Refactor evil-collection-init code Make it possible to disable image-mode and elisp-mode evil-collection modules. --- modules/feature/evil/config.el | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el index badb5d907..f32ff1142 100644 --- a/modules/feature/evil/config.el +++ b/modules/feature/evil/config.el @@ -221,8 +221,12 @@ variable for an explanation of the defaults (in comments). See "ZQ" 'evil-quit "ZZ" 'quit-window)) - (add-transient-hook! 'image-mode (evil-collection-init 'image)) - (add-transient-hook! 'emacs-lisp-mode (evil-collection-init 'elisp-mode)) + (defun +evil-collection-init (module) + (unless (memq (or (car-safe module) module) +evil-collection-disabled-list) + (evil-collection-init (list module)))) + + (add-transient-hook! 'image-mode (+evil-collection-init 'image)) + (add-transient-hook! 'emacs-lisp-mode (+evil-collection-init 'elisp-mode)) (defvar evil-collection-mode-list '(ace-jump-mode @@ -328,10 +332,8 @@ variable for an explanation of the defaults (in comments). See (ztree ztree-diff))) (dolist (req evil-collection-mode-list) - (let ((feature (car (doom-enlist req)))) - (with-eval-after-load feature - (unless (memq feature +evil-collection-disabled-list) - (evil-collection-init (list req)))))))) + (with-eval-after-load (car (doom-enlist req)) + (+evil-collection-init (list req)))))) ;;