From 888bd970938b934b8fca60982251b06f7dae1de3 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 28 Jun 2018 22:41:23 +0200 Subject: [PATCH] Fix evil-collection-neotree throwing void-function Because it is using the neotree-make-executor macro without requiring `neotree` at compile time. Also, remove the helm fix because they no longer use the `with-helm-buffer` macro. --- modules/feature/evil/packages.el | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/modules/feature/evil/packages.el b/modules/feature/evil/packages.el index 20ee93058..1e04024de 100644 --- a/modules/feature/evil/packages.el +++ b/modules/feature/evil/packages.el @@ -1,17 +1,9 @@ ;; -*- no-byte-compile: t; -*- ;;; feature/evil/packages.el -;; `evil-collection' uses the `with-helm-buffer' macro, but this requires helm -;; be loaded before it is byte-compiled during installation. To ensure this, we -;; declare helm before evil-collection. -(when (featurep! :completion helm) - (depends-on! :completion helm)) - -;; (package! evil) (package! evil-args) (package! evil-commentary) -(package! evil-collection) (package! evil-easymotion) (package! evil-embrace) (package! evil-escape) @@ -27,3 +19,13 @@ (package! evil-vimish-fold) (package! evil-visualstar) (package! exato) + + +;; +(when (featurep! +everywhere) + ;; `evil-collection-neotree' uses the `neotree-make-executor' macro, but this + ;; requires neotree be available during byte-compilation (while installing). + (when (featurep! :ui neotree) + (depends-on! :ui neotree)) + + (package! evil-collection))