From 5966e9aa9ce1efafa0387226ca5bb875bce92e97 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 26 Jun 2018 18:05:35 +0200 Subject: [PATCH] Restore +evil-collection-disabled-list Without this variable, the user can't easily prevent certain evil-collection modules from loading without some provide voodoo. --- modules/feature/evil/config.el | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el index 62ed2bbca..badb5d907 100644 --- a/modules/feature/evil/config.el +++ b/modules/feature/evil/config.el @@ -3,6 +3,11 @@ ;; I'm a vimmer at heart. Its modal philosophy suits me better, and this module ;; strives to make Emacs a much better vim than vim was. +(defvar +evil-collection-disabled-list () + "A list of `evil-collection' modules to ignore. See the definition of this +variable for an explanation of the defaults (in comments). See +`evil-collection-mode-list' for a list of available options.") + (def-package! evil :init (setq evil-want-C-u-scroll t @@ -323,8 +328,10 @@ (ztree ztree-diff))) (dolist (req evil-collection-mode-list) - (with-eval-after-load (car (doom-enlist req)) - (evil-collection-init (list req)))))) + (let ((feature (car (doom-enlist req)))) + (with-eval-after-load feature + (unless (memq feature +evil-collection-disabled-list) + (evil-collection-init (list req)))))))) ;;