emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

org: refactor + fix incorrectly attached hooks

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

Fixes #186
This commit is contained in:
Henrik Lissner 2017-09-05 16:42:00 +02:00
parent 735fcd099c
commit b1ae7f576d
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
modules/org/org/config.el
View file

@ -44,16 +44,25 @@
(defun +org|hook () (defun +org|hook ()
"Run everytime `org-mode' is enabled." "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) (setq line-spacing 1)
(visual-line-mode +1)
(doom|disable-line-numbers) (doom|disable-line-numbers)
;; show-paren-mode causes problems for org-indent-mode ;; show-paren-mode causes problems for org-indent-mode, so disable it
(make-local-variable 'show-paren-mode) (set (make-local-variable 'show-paren-mode) nil)
(setq show-paren-mode nil)
(unless org-agenda-inhibit-startup (unless org-agenda-inhibit-startup
;; My version of the 'overview' #+STARTUP option: expand first-level ;; 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) (when (eq org-startup-folded t)
(outline-hide-sublevels 2)) (outline-hide-sublevels 2))
@ -73,14 +82,6 @@
:keymap (make-sparse-keymap) :keymap (make-sparse-keymap)
:group 'evil-org) :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-ui)
(+org-init-keybinds) (+org-init-keybinds)
(+org-hacks)) (+org-hacks))
@ -207,8 +208,8 @@ between the two."
(t . ,(cond (IS-MAC "open -R \"%s\"") (t . ,(cond (IS-MAC "open -R \"%s\"")
(IS-LINUX "xdg-open \"%s\""))))) (IS-LINUX "xdg-open \"%s\"")))))
;; Remove highlights on ESC
(defun +org|remove-occur-highlights () (defun +org|remove-occur-highlights ()
"Remove org occur highlights on ESC in normal mode."
(when (derived-mode-p 'org-mode) (when (derived-mode-p 'org-mode)
(org-remove-occur-highlights) (org-remove-occur-highlights)
t)) t))