From 863063b60d016b394e06d0dbaeb5a0007fe8e5fa Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 11 Dec 2020 05:01:33 -0500
Subject: [PATCH] Defer internal help & help-mode packages

To simplify load order so users can easily modify help-mode-map after
evil-collection has. e.g.

  (map! :after help
        :map help-mode-map
        :n "C-o" nil)
---
 modules/editor/evil/init.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/editor/evil/init.el b/modules/editor/evil/init.el
index b309b0f74..f9d65e816 100644
--- a/modules/editor/evil/init.el
+++ b/modules/editor/evil/init.el
@@ -37,7 +37,6 @@
       elisp-mode
       ert
       free-keys
-      help
       helm
       indent
       image
@@ -263,10 +262,15 @@ and complains if a module is loaded too early (during startup)."
       "q" #'kill-current-buffer
       "d" #'process-menu-delete-process)
 
-    (mapc #'+evil-collection-init '(comint custom help)))
+    (mapc #'+evil-collection-init '(comint custom)))
 
   ;; ...or on first invokation of their associated major/minor modes.
   (after! evil
+    ;; Emacs loads these two packages immediately, at startup, which needlessly
+    ;; convolutes load order for evil-collection-help.
+    (defer-feature! help help-mode)
+    (defer-feature! help-mode help-mode)
+
     (add-transient-hook! 'Buffer-menu-mode
       (+evil-collection-init '(buff-menu "buff-menu")))
     (add-transient-hook! 'image-mode