From 6c52e33302748a0038edf1cdb850d49928132b26 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Thu, 5 Aug 2021 21:24:01 -0400
Subject: [PATCH] fix(evil): don't load help.el twice

a2a128d3 changed prefix-help-command to use embark. This commit fixes
prefix-help-command getting reset to describe-prefix-bindings due to
help.el setting it at top-level because it is eventually loaded twice
due to defer-feature!, which removes a symbol from emacs' list of loaded
features.

Ref a2a128d3a56a
---
 modules/editor/evil/init.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/editor/evil/init.el b/modules/editor/evil/init.el
index 54276ea15..b06c3a6ba 100644
--- a/modules/editor/evil/init.el
+++ b/modules/editor/evil/init.el
@@ -39,6 +39,7 @@
       ert
       free-keys
       helm
+      help
       indent
       image
       kotlin-mode
@@ -280,9 +281,8 @@ and complains if a module is loaded too early (during startup)."
   (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! 'help-mode
+      (+evil-collection-init 'help))
     (add-transient-hook! 'Buffer-menu-mode
       (+evil-collection-init '(buff-menu "buff-menu")))
     (add-transient-hook! 'calc-mode