From 666690a392f76d38cf4898f69b9e19329cd667d5 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Mon, 30 Dec 2013 23:56:57 +0100
Subject: Reorder misc stuff

---
 .emacs.d/init.el | 47 ++++++++++++++++++++---------------------------
 1 file changed, 20 insertions(+), 27 deletions(-)

(limited to '.emacs.d/init.el')

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 4a31ea6..fc4b2b7 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -888,6 +888,8 @@ If no direction is given, don't split."
 ;; be too late.
 (setq elnode-do-init nil)
 
+(add-to-list 'debug-ignored-errors "^Can't shift all lines enough")
+
 ;;;; Module-specific settings
 
 (stante-after appt
@@ -1108,6 +1110,7 @@ If no direction is given, don't split."
   (setq mouse-yank-at-point t))
 
 (stante-after org
+  (require 'org-init)
   (setq org-special-ctrl-a/e t))
 
 (stante-after org2blog
@@ -1336,40 +1339,32 @@ If no direction is given, don't split."
 (when (or window-system (daemonp))
   (global-unset-key "\C-z"))
 
-;;;; Visual cues
-
-(turn-off menu-bar-mode scroll-bar-mode tool-bar-mode blink-cursor-mode
-          column-number-mode line-number-mode tooltip-mode)
-
-;;;; Symbols
-
-(add-to-list 'debug-ignored-errors "^Can't shift all lines enough")
+;;;; Misc modes
 
 (enable '(downcase-region narrow-to-page narrow-to-region scroll-left
           upcase-region))
 
-(eval-after-init (ido-ubiquitous-mode))
+(turn-off menu-bar-mode scroll-bar-mode tool-bar-mode blink-cursor-mode
+          column-number-mode line-number-mode tooltip-mode)
 
-(eval-after-load "org" '(require 'org-init))
+(link-modes outline-minor-mode persistent-outline-mode)
+(make-modes-exclusive magit-blame-mode fci-mode)
 
 (eval-after-init
   (require 'auto-complete-config)
-  (ac-config-default))
+  (ac-config-default)
+
+  (ido-ubiquitous-mode)
+  (smex-initialize)
+  (global-diff-hl-mode)
+  (mode-icons-mode)
+  (desktop-registry-auto-register))
 
 (when (equal system-name "drd")
   (eval-after-init
    (load (expand-file-name "~/.local/share/quicklisp/slime-helper.el")))
   (load "eap-autoloads"))
 
-(eval-after-init (smex-initialize))
-(eval-after-init (global-diff-hl-mode))
-(eval-after-init (mode-icons-mode))
-(eval-after-init (desktop-registry-auto-register))
-
-
-;; (setq pony-tpl-indent-moves t)
-;; (setq rainbow-delimiters-max-face-count 12)
-
 (ido-mode)
 (minibuffer-electric-default-mode)
 (auto-insert-mode)
@@ -1379,15 +1374,13 @@ If no direction is given, don't split."
 (help-at-pt-set-timer)
 (windmove-default-keybindings)
 
-;;; Finally, load any `customize' settings.
-(load custom-file)
-
-;;;; Connected modes
+(electric-indent-mode -1)
 
-(link-modes outline-minor-mode persistent-outline-mode)
-(make-modes-exclusive magit-blame-mode fci-mode)
+;;;; Custom
+;; Finally, load any `customize' settings.
+(load custom-file)
 
-(electric-indent-mode -1)
+;;;; End
 
 (provide 'init)
 ;;; init.el ends here
-- 
cgit v1.2.3-54-g00ecf