From 521ef4749f1e0a9fdfe35b07ee0ecc1ddd88ecff Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Wed, 16 Jan 2013 01:30:00 +0100
Subject: Emacs: Cleanup `eval-after-load's

Also set `sentence-end-double-space' to nil so I don't have to use
double spaces to end a sentence and keep the fill functions happy.
---
 .emacs.d/init.el | 75 ++++++++------------------------------------------------
 1 file changed, 10 insertions(+), 65 deletions(-)

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

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 76ac42a..9228ec8 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -8,71 +8,15 @@
 
 (load (concat user-emacs-directory "init2"))
 
-(eval-after-load "emms-source-file"
-  '(progn
-     (require 'emms-setup)
-     (require 'emms-player-mpd)
-
-     (emms-standard)
-
-     (add-to-list 'emms-info-functions 'emms-info-mpd)
-     (add-to-list 'emms-player-list 'emms-player-mpd)
-
-     (setq emms-player-mpd-server-name "localhost")
-     (setq emms-player-mpd-server-port "6600")
-     (setq emms-player-mpd-music-directory "/mnt/music/mp3")))
-
-(eval-after-load "flymake"
-  '(progn
-     (require 'flymake-cursor)
-
-     (add-to-list                       ; Make sure pyflakes is loaded
-      'flymake-allowed-file-name-masks  ; for python files.
-      '("\\.py\\'" ext:flymake-pyflakes-init))
-
-     (add-to-list                       ; Error line repexp for go
-      'flymake-err-line-patterns        ; compilation.
-      '("^\\([a-zA-Z0-9_]+\\.go\\):\\([0-9]+\\):\\(.*\\)$"
-        1 2 nil 3))
-
-     (add-to-list                       ; Go uses makefiles, makes
-      'flymake-allowed-file-name-masks  ; flymaking 'easy'.
-      '("\\.go$" flymake-simple-make-init))))
-
-(eval-after-load "ido"
-  '(setq ido-ignore-buffers
-         (list "^\\` " "^irc\\." "^\\#" "^\\*Customize Option:"
-               (eval-when-compile
-                 (regexp-opt
-                  '("*-jabber-roster-*"
-                    "*Messages*"
-                    "*fsm-debug*"
-                    "*magit-process*"
-                    "*magit-edit-log*"
-                    "*Backtrace*"))))))
-
-(eval-after-load "jabber"
-  '(remove-hook 'jabber-alert-presence-hooks 'jabber-presence-echo))
-
-(eval-after-load "newst-treeview"
-  '(require 'newsticker-init))
-
-(eval-after-load "org"
-  '(require 'org-init))
-
-(eval-after-load "pretty-symbols-mode"
-  '(diminish 'pretty-symbols-mode))
-
-(eval-after-load "rainbow-mode"
-  '(diminish 'rainbow-mode))
-
-(eval-after-load "smex"
-  '(progn
-     (global-set-key (kbd "M-x") 'smex)
-     (global-set-key (kbd "C-M-x") 'smex-major-mode-commands)))
-
-(eval-after-load "yasnippet"
-  '(diminish 'yas-minor-mode))
+(eval-after-load "emms-source-file" '(oni:emms-init))
+(eval-after-load "flymake" '(oni:flymake-init))
+(eval-after-load "ido" '(oni:ido-init))
+(eval-after-load "jabber" '(oni:jabber-init))
+(eval-after-load "newst-treeview" '(require 'newsticker-init))
+(eval-after-load "org" '(require 'org-init))
+(eval-after-load "rainbow-mode" '(oni:rainbow-mode-init))
+(eval-after-load "smex" '(oni:smex-init))
+(eval-after-load "yasnippet" '(oni:yasnippet-init))
 
 (put 'upcase-region 'disabled nil)
 (put 'downcase-region 'disabled nil)
@@ -231,6 +175,7 @@
 (setq redisplay-dont-pause t)
 (setq send-mail-function 'smtpmail-send-it)
 (setq sendmail-program "/usr/bin/msmtp")
+(setq sentence-end-double-space nil)
 (setq smex-key-advice-ignore-menu-bar t)
 (setq smex-save-file "~/.emacs.d/smex-items")
 (setq split-height-threshold 40)
-- 
cgit v1.2.3-54-g00ecf