From fa2fbcbffe425870376f3dfcb1de31a04e80f5cd Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Thu, 18 May 2017 01:28:48 +0200
Subject: [PATCH] Ensure folding system is initialized soon enough

---
 modules/feature/evil/autoload/folds.el | 17 -----------------
 modules/feature/evil/config.el         | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/modules/feature/evil/autoload/folds.el b/modules/feature/evil/autoload/folds.el
index ae86a2ba0..3259ab50c 100644
--- a/modules/feature/evil/autoload/folds.el
+++ b/modules/feature/evil/autoload/folds.el
@@ -10,23 +10,6 @@
 ;; Initialize the two modes
 (evil-vimish-fold-mode +1)
 
-(defun +evil*fold-hs-minor-mode (&rest args)
-  "Lazily activate buffer-local hs-minor-mode."
-  (unless (bound-and-true-p hs-minor-mode)
-    (hs-minor-mode +1)))
-(advice-add #'evil-fold-action :before #'+evil*fold-hs-minor-mode)
-
-(add-to-list
- 'evil-fold-list
- '((evil-vimish-mode hs-minor-mode)
-   :delete vimish-fold-delete
-   :open-all +evil/fold-open-all
-   :close-all +evil/fold-close-all
-   :toggle +evil/fold-toggle
-   :open +evil/fold-open
-   :open-rec nil
-   :close +evil/fold-close))
-
 
 ;; --- fold functions ---------------------
 
diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el
index 6968ac1c7..39b049348 100644
--- a/modules/feature/evil/config.el
+++ b/modules/feature/evil/config.el
@@ -54,6 +54,24 @@
   ;; Don't interfere with localleader key
   (define-key evil-motion-state-map "\\" nil)
 
+  ;; Custom folding system
+  (add-to-list
+   'evil-fold-list
+   '((evil-vimish-mode hs-minor-mode)
+     :delete vimish-fold-delete
+     :open-all +evil/fold-open-all
+     :close-all +evil/fold-close-all
+     :toggle +evil/fold-toggle
+     :open +evil/fold-open
+     :open-rec nil
+     :close +evil/fold-close))
+
+  (defun +evil*fold-hs-minor-mode (&rest args)
+    "Lazily activate buffer-local hs-minor-mode."
+    (unless (bound-and-true-p hs-minor-mode)
+      (hs-minor-mode +1)))
+  (advice-add #'evil-fold-action :before #'+evil*fold-hs-minor-mode)
+
   ;; Set cursor colors later, once theme is loaded
   (defun +evil*init-cursors (&rest _)
     (setq evil-default-cursor (face-background 'cursor nil t)