From bc4fb8f18edc1ff672a0cad3a5653a2e98132504 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 5 Jun 2018 14:08:29 +0200 Subject: [PATCH] Fix helm macro errors due to load order Some packages (like evil-collection and dumb-jump) use helm macros, but Doom cannot ensure helm will be installed by the time these packages are byte-compiled during installation. In fact, the default load order prevents this. Rather than imposing hard load order requirements, we just make sure helm is higher on the packages list, so it gets installed sooner. --- modules/feature/evil/packages.el | 7 +++++++ modules/feature/lookup/packages.el | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/modules/feature/evil/packages.el b/modules/feature/evil/packages.el index 642acc328..cafea2efc 100644 --- a/modules/feature/evil/packages.el +++ b/modules/feature/evil/packages.el @@ -1,6 +1,13 @@ ;; -*- 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) diff --git a/modules/feature/lookup/packages.el b/modules/feature/lookup/packages.el index cf09f591b..edfc1acad 100644 --- a/modules/feature/lookup/packages.el +++ b/modules/feature/lookup/packages.el @@ -1,6 +1,13 @@ ;; -*- no-byte-compile: t; -*- ;;; feature/lookup/packages.el +;; `dumb-jump' uses the `helm-build-sync-source' macro, but this requires helm be +;; loaded before it is byte-compiled during installation. To ensure this, we +;; declare helm before dumb-jump. +(when (featurep! :completion helm) + (depends-on! :completion helm)) + +;; (package! dumb-jump) (when (featurep! :completion ivy) (package! ivy-xref))