From b1ae7f576d81104418ea8b805002499e6bd8b711 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Tue, 5 Sep 2017 16:42:00 +0200
Subject: [PATCH] org: refactor + fix incorrectly attached hooks

Buffer-local hooks were being added on org-load-hook, rather than
org-mode-hook.

Fixes #186
---
 modules/org/org/config.el | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/modules/org/org/config.el b/modules/org/org/config.el
index 4660e786d..89592b9da 100644
--- a/modules/org/org/config.el
+++ b/modules/org/org/config.el
@@ -44,16 +44,25 @@
 
 (defun +org|hook ()
   "Run everytime `org-mode' is enabled."
+  (when (featurep! :feature evil)
+    (add-hook 'evil-insert-state-exit-hook #'+org|realign-table-maybe nil t)
+    (add-hook 'evil-insert-state-exit-hook #'+org|update-cookies nil t)
+    (+org-evil-mode +1))
+
+  ;; TODO Add filesize checks (possibly too expensive in big org files)
+  (add-hook 'before-save-hook #'+org|update-cookies nil t)
+
+  ;;
   (setq line-spacing 1)
+  (visual-line-mode +1)
   (doom|disable-line-numbers)
 
-  ;; show-paren-mode causes problems for org-indent-mode
-  (make-local-variable 'show-paren-mode)
-  (setq show-paren-mode nil)
+  ;; show-paren-mode causes problems for org-indent-mode, so disable it
+  (set (make-local-variable 'show-paren-mode) nil)
 
   (unless org-agenda-inhibit-startup
     ;; My version of the 'overview' #+STARTUP option: expand first-level
-    ;; headings.
+    ;; headings. Expands the first level, but no further.
     (when (eq org-startup-folded t)
       (outline-hide-sublevels 2))
 
@@ -73,14 +82,6 @@
     :keymap (make-sparse-keymap)
     :group 'evil-org)
 
-  (add-hook 'org-mode-hook #'visual-line-mode)
-  (when (featurep! :feature evil)
-    (add-hook 'org-mode-hook #'+org-evil-mode))
-
-  (add-hook 'evil-insert-state-exit-hook #'+org|realign-table-maybe nil t)
-  (add-hook 'evil-insert-state-exit-hook #'+org|update-cookies nil t)
-  (add-hook 'before-save-hook #'+org|update-cookies nil t)
-
   (+org-init-ui)
   (+org-init-keybinds)
   (+org-hacks))
@@ -207,8 +208,8 @@ between the two."
           (t . ,(cond (IS-MAC "open -R \"%s\"")
                       (IS-LINUX "xdg-open \"%s\"")))))
 
-  ;; Remove highlights on ESC
   (defun +org|remove-occur-highlights ()
+    "Remove org occur highlights on ESC in normal mode."
     (when (derived-mode-p 'org-mode)
       (org-remove-occur-highlights)
       t))