Prevent non-prefix key errors on doom//refresh

May also help doom/reload

core/autoload/cli.el

@@ -4,7 +4,10 @@
 
 ;;;###autoload
 (defun doom-cli-run (command &rest _args)
-  (let* ((default-directory doom-emacs-dir)
+  (when (featurep 'general)
+    (general-auto-unbind-keys))
+  (let* ((evil-collection-mode-list nil)
+         (default-directory doom-emacs-dir)
          (buf (get-buffer-create " *bin/doom*"))
          (doom-message-backend 'ansi)
          (ignore-window-parameters t)
@@ -26,6 +29,8 @@
       (redisplay)
       (doom-dispatch command nil)
       (print! (green "\nDone!"))))
+  (when (featurep 'general)
+    (general-auto-unbind-keys 'undo))
   (message (format! (green "Done!"))))
 
 

modules/editor/evil/config.el

@@ -148,7 +148,8 @@ line with a linewise comment.")
    '+evil:align :move-point t :ex-arg 'buffer-match :ex-bang t :keep-visual t :suppress-operator t)
 
   ;; `evil-collection'
-  (when (featurep! +everywhere)
+  (when (and (featurep! +everywhere)
+             (not doom-reloading-p))
     (load! "+everywhere"))
 
   ;; Custom evil ex commands