Reorder hooks

1 files changed, 69 insertions, 78 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index ed7a05d..6c217e1 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1168,69 +1168,42 @@ If no direction is given, don't split."
   (setq yas-fallback-behavior nil)
   (setq yas-prompt-functions '(yas-ido-prompt)))
 
-;;;; Visual cues
-
-(turn-off menu-bar-mode scroll-bar-mode tool-bar-mode blink-cursor-mode
-          column-number-mode line-number-mode tooltip-mode)
-
-;;;; Typography
+;;;; Hooks
 
 ;; Use double spaces to end lines in Emacs Lisp.  The checkdoc
 ;; function starts complaining if you don't.
 (add-hook 'emacs-lisp-mode-hook #'init-locally-enable-double-spaces)
 
-;;;; Symbols
-
-(eval-and-compile
-  (mapc #'loadpath-add-and-autoload
-        '("~/.emacs.d/site-lisp" "~/projects/emacs/pony-mode/src"
-          "~/.emacs.d/vendor-lisp/org/lisp"
-          "~/.emacs.d/vendor-lisp/org/contrib/lisp"
-          "~/.emacs.d/vendor-lisp/mozrepl"
-          "~/.emacs.d/vendor-lisp/eap" "/usr/share/emacs/site-lisp")))
-
+(add-hook 'after-save-hook 'oni:after-save-func t)
+(add-hook 'before-save-hook 'oni:before-save-func)
+(add-hook 'c-mode-hook #'smartparens-strict-mode)
+(add-hook 'c-mode-hook 'oni:c-mode-func)
+(add-hook 'css-mode-hook 'oni:css-mode-func)
+(add-hook 'diary-display-hook 'oni:diary-display-func)
 (add-hook 'emacs-lisp-mode-hook #'init-set-emacs-lisp-symbols)
+(add-hook 'go-mode-hook 'oni:go-mode-func)
+(add-hook 'haskell-mode-hook 'oni:haskell-mode-func)
+(add-hook 'jabber-chat-mode-hook #'init-set-keys-for-jabber-chat)
+(add-hook 'java-mode-hook 'oni:java-mode-func)
+(add-hook 'javascript-mode-hook 'moz-minor-mode)
+(add-hook 'js-mode-hook 'oni:js-mode-func)
+(add-hook 'js2-mode-hook #'tern-mode)
+(add-hook 'js2-mode-hook 'oni:js2-mode-func)
 (add-hook 'lisp-mode-hook #'init-set-emacs-lisp-symbols)
+(add-hook 'lua-mode-hook 'oni:lua-mode-func)
+(add-hook 'markdown-mode-hook 'oni:markdown-mode-func)
+(add-hook 'outline-minor-mode-hook #'init-set-tab-maybe-toggle-outline)
+(add-hook 'php-mode-hook 'oni:php-mode-func)
+(add-hook 'prog-mode-hook 'oni:prog-mode-func)
 (add-hook 'python-mode-hook #'init-set-python-symbols)
+(add-hook 'python-mode-hook 'oni:python-mode-func)
+(add-hook 'term-mode-hook 'oni:term-mode-func)
+(add-hook 'write-file-hooks 'oni:write-file-func)
+(add-hook 'yas-minor-mode-hook 'oni:yas-minor-mode-func)
 
 (when (fboundp 'prettify-symbols-mode)
   (add-hook 'prog-mode-hook 'prettify-symbols-mode))
 
-(defadvice windmove-do-window-select
-  (around init-windmove-stumpwm activate)
-  "If no window can be moved to, move stumpwm."
-  (condition-case err
-      ad-do-it
-    (error (stumpwm-command (format "move-focus %s" (ad-get-arg 0))))))
-
-(global-set-key (kbd "C-c S") #'split-window-right)
-(global-set-key (kbd "C-c s") #'split-window-below)
-(global-set-key (kbd "C-c Q") #'delete-other-windows)
-(global-set-key (kbd "C-c R") #'delete-window)
-
-(add-to-list 'load-path "/usr/lib/node_modules/tern/emacs/")
-
-(add-hook 'js2-mode-hook #'tern-mode)
-
-(global-set-key (kbd "C-. C-.") #'init-switch-to-other-buffer)
-
-(add-hook 'c-mode-hook #'smartparens-strict-mode)
-
-(add-hook 'javascript-mode-hook 'moz-minor-mode)
-
-(global-set-key (kbd "C-c -") #'decrease-number-at-point)
-(global-set-key (kbd "C-c +") #'increase-number-at-point)
-
-(defadvice org-agenda-redo (after ext:org-agenda-redo-add-appts)
-  "Pressing `r' on the agenda will also add appointments."
-  (progn
-    (setq appt-time-msg-list nil)
-    (org-agenda-to-appt)))
-
-(defadvice term-handle-exit (after oni:kill-buffer-after-exit activate)
-  "Kill the term buffer if the process finished."
-  (kill-buffer (current-buffer)))
-
 (mode-hooks
   ((clojure emacs-lisp lisp sawfish scheme ielm geiser-repl slime-repl)
    paredit-mode)
@@ -1268,6 +1241,51 @@ If no direction is given, don't split."
   ((tagedit) init-set-keys-for-tagedit)
   ((vala) oni:vala-mode-func))
 
+;;;; Visual cues
+
+(turn-off menu-bar-mode scroll-bar-mode tool-bar-mode blink-cursor-mode
+          column-number-mode line-number-mode tooltip-mode)
+
+;;;; Typography
+
+;;;; Symbols
+
+(eval-and-compile
+  (mapc #'loadpath-add-and-autoload
+        '("~/.emacs.d/site-lisp" "~/projects/emacs/pony-mode/src"
+          "~/.emacs.d/vendor-lisp/org/lisp"
+          "~/.emacs.d/vendor-lisp/org/contrib/lisp"
+          "~/.emacs.d/vendor-lisp/mozrepl"
+          "~/.emacs.d/vendor-lisp/eap" "/usr/share/emacs/site-lisp")))
+
+(defadvice windmove-do-window-select
+  (around init-windmove-stumpwm activate)
+  "If no window can be moved to, move stumpwm."
+  (condition-case err
+      ad-do-it
+    (error (stumpwm-command (format "move-focus %s" (ad-get-arg 0))))))
+
+(global-set-key (kbd "C-c S") #'split-window-right)
+(global-set-key (kbd "C-c s") #'split-window-below)
+(global-set-key (kbd "C-c Q") #'delete-other-windows)
+(global-set-key (kbd "C-c R") #'delete-window)
+
+(add-to-list 'load-path "/usr/lib/node_modules/tern/emacs/")
+
+(global-set-key (kbd "C-. C-.") #'init-switch-to-other-buffer)
+
+(global-set-key (kbd "C-c -") #'decrease-number-at-point)
+(global-set-key (kbd "C-c +") #'increase-number-at-point)
+
+(defadvice org-agenda-redo (after ext:org-agenda-redo-add-appts)
+  "Pressing `r' on the agenda will also add appointments."
+  (progn
+    (setq appt-time-msg-list nil)
+    (org-agenda-to-appt)))
+
+(defadvice term-handle-exit (after oni:kill-buffer-after-exit activate)
+  "Kill the term buffer if the process finished."
+  (kill-buffer (current-buffer)))
 
 (add-to-list 'debug-ignored-errors "^Can't shift all lines enough")
 
@@ -1296,25 +1314,6 @@ If no direction is given, don't split."
 ;; (setq pony-tpl-indent-moves t)
 ;; (setq rainbow-delimiters-max-face-count 12)
 
-(add-hook 'after-save-hook 'oni:after-save-func t)
-(add-hook 'before-save-hook 'oni:before-save-func)
-(add-hook 'c-mode-hook 'oni:c-mode-func)
-(add-hook 'css-mode-hook 'oni:css-mode-func)
-(add-hook 'diary-display-hook 'oni:diary-display-func)
-(add-hook 'go-mode-hook 'oni:go-mode-func)
-(add-hook 'haskell-mode-hook 'oni:haskell-mode-func)
-(add-hook 'java-mode-hook 'oni:java-mode-func)
-(add-hook 'js-mode-hook 'oni:js-mode-func)
-(add-hook 'js2-mode-hook 'oni:js2-mode-func)
-(add-hook 'lua-mode-hook 'oni:lua-mode-func)
-(add-hook 'markdown-mode-hook 'oni:markdown-mode-func)
-(add-hook 'php-mode-hook 'oni:php-mode-func)
-(add-hook 'prog-mode-hook 'oni:prog-mode-func)
-(add-hook 'python-mode-hook 'oni:python-mode-func)
-(add-hook 'term-mode-hook 'oni:term-mode-func)
-(add-hook 'write-file-hooks 'oni:write-file-func)
-(add-hook 'yas-minor-mode-hook 'oni:yas-minor-mode-func)
-
 (global-set-key (kbd "'") 'oni:self-insert-dwim)
 (global-set-key (kbd "<XF86HomePage>") 'oni:raise-scratch)
 (global-set-key (kbd "<XF86Mail>") 'gnus)
@@ -1388,14 +1387,6 @@ If no direction is given, don't split."
 (link-modes outline-minor-mode persistent-outline-mode)
 (make-modes-exclusive magit-blame-mode fci-mode)
 
-;;;; Make toggling outlines easier
-
-(add-hook 'outline-minor-mode-hook #'init-set-tab-maybe-toggle-outline)
-
-;;;; Share the output AND the command
-
-(add-hook 'jabber-chat-mode-hook #'init-set-keys-for-jabber-chat)
-
 (electric-indent-mode -1)
 
 (provide 'init)