Merge remote-tracking branch 'origin/master' into phoenix

Conflicts:
	.emacs.d/init.el

1 files changed, 27 insertions, 53 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index a30a55c..d2d68bc 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -6,48 +6,10 @@
 
 ;;; Code:
 
-(eval-and-compile
-  (package-initialize)
-
-  (mapc #'(lambda (directory)
-            (add-to-list 'load-path directory)
-            (let ((default-directory directory))
-              (normal-top-level-add-subdirs-to-load-path)))
-        '("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp"))
-  (mapc #'(lambda (directory)
-            (add-to-list 'load-path directory)
-            (let ((loaddefs (concat directory "/loaddefs.el")))
-              (when (file-exists-p loaddefs)
-                (load loaddefs))))
-        '("~/var/src/emacs/dispass.el" "~/var/src/emacs/mode-icons"))
-  (mapc #'(lambda (dir)
-            (add-to-list 'custom-theme-load-path dir))
-        '("~/var/src/emacs/yoshi-theme")))
-
-(require 'geiser-install)
-(require 'iso-transl)
-(require 'newcomment)
-(require 'uniquify)
-(require 'w3m-load)
-(require 'ext)
-(require 'oni)
+(load (concat user-emacs-directory "init2"))
 
-(defalias 'dabbrev-expand 'hippie-expand)
-
-(autoload 'define-slime-contrib "slime")
-(autoload 'gtags-mode "gtags" nil t)
-(autoload 'identica-mode "identica-mode" nil t)
-(autoload 'jabber-connect "jabber" nil t)
-(autoload 'mu4e "mu4e" nil t)
-(autoload 'php-mode "php-mode" nil t)
-(autoload 'po-mode "po-mode" nil t)
-(autoload 'pony-mode "pony-mode" nil t)
-(autoload 'sawfish-mode "sawfish" nil t)
-(autoload 'server-running-p "server")
-(autoload 'slime-js-minor-mode "slime-js" nil t)
-(autoload 'xmodmap-mode "xmodmap-mode" nil t)
-
-(load (expand-file-name "~/.emacs.d/site-lisp/loaddefs.el"))
+(define-key key-translation-map (kbd "C-j") (kbd "C-l"))
+(define-key key-translation-map (kbd "C-l") (kbd "C-j"))
 
 (defalias 'yes-or-no-p 'y-or-n-p)
 (defalias 'list-buffers 'ibuffer)
@@ -68,6 +30,9 @@
   "Face for the supposedly empty line in commit messages."
   :group 'local)
 
+(eval-after-load "eldoc"
+  '(diminish 'eldoc-mode))
+
 (eval-after-load "em-term"
   '(add-to-list 'eshell-visual-commands "unison"))
 
@@ -102,9 +67,6 @@
       'flymake-allowed-file-name-masks  ; flymaking 'easy'.
       '("\\.go$" flymake-simple-make-init))))
 
-(eval-after-load "hippie-exp"
-  '(oni:load-hippie-exp 'yasnippet))
-
 (eval-after-load "ido"
   '(setq ido-ignore-buffers `(,@ido-ignore-buffers
                               "^\\*.*\\*$" "^irc\\." "^\\#")))
@@ -118,13 +80,19 @@
 (eval-after-load "org"
   '(require 'org-init))
 
+(eval-after-load "pretty-symbols-mode"
+  '(diminish 'pretty-symbols-mode))
+
+(eval-after-load "rainbow-mode"
+  '(diminish 'rainbmow-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"
-  '(oni:load-hippie-exp 'hippie-exp))
+  '(diminish 'yas-minor-mode))
 
 (put 'upcase-region 'disabled nil)
 (put 'downcase-region 'disabled nil)
@@ -241,7 +209,7 @@
 (setq ido-default-buffer-method 'selected-window)
 (setq ido-max-window-height 1)
 (setq ido-save-directory-list-file nil)
-(setq ido-ubiquitous-command-exceptions '(oni:view-mail tmm-menubar))
+(setq ido-ubiquitous-command-exceptions '(org-refile))
 (setq inferior-lisp-program "sbcl")
 (setq inhibit-default-init t)
 (setq inhibit-local-menu-bar-menus t)
@@ -264,7 +232,6 @@
 (setq message-log-max 1000)
 (setq message-send-mail-function 'message-send-mail-with-sendmail)
 (setq message-sendmail-extra-arguments '("-a" "ryuslash"))
-(setq mode-line-position nil)
 (setq package-archives
       '(("melpa" . "http://melpa.milkbox.net/packages/")
         ("ELPA" . "http://tromey.com/elpa/")
@@ -296,6 +263,8 @@
 (setq user-mail-address "tom@ryuslash.org")
 (setq w3m-fill-column 72)
 (setq window-combination-resize t)
+(setq yas-fallback-behavior nil)
+(setq yas-prompt-functions '(yas-ido-prompt))
 
 (add-hook 'after-change-major-mode-hook 'set-current-mode-icon)
 (add-hook 'after-save-hook 'oni:after-save-func t)
@@ -392,12 +361,13 @@
 
 (add-to-list
  'display-buffer-alist
- '(".*" . ((display-buffer-same-window . nil))))
+ '("^\\*\\(?:.+-\\)?scratch\\*$" . ((display-buffer-same-window . nil))))
 (add-to-list
  'display-buffer-alist
  '("^\\*git-project-list\\*$" . ((git-project-show-window . nil))))
-
-(delete "   " mode-line-format)
+(add-to-list
+ 'display-buffer-alist
+ '("^\\*magit: .*\\*$" . ((display-buffer-same-window . nil))))
 
 (unless (oni:required-packages-installed-p)
   (message "%s" "Refreshing package database...")
@@ -409,12 +379,12 @@
         oni:required-packages))
 
 (blink-cursor-mode -1)
+(column-number-mode -1)
+(line-number-mode -1)
 (menu-bar-mode -1)
 (scroll-bar-mode -1)
 (tool-bar-mode -1)
 (tooltip-mode -1)
-(line-number-mode -1)
-(column-number-mode -1)
 
 (auto-insert-mode)
 (electric-indent-mode)
@@ -423,6 +393,7 @@
 (ido-ubiquitous-mode)
 (savehist-mode)
 (show-paren-mode)
+(winner-mode)
 (display-battery-mode)
 
 (smex-initialize)
@@ -431,11 +402,14 @@
 (load-theme 'yoshi t)
 
 (load custom-file)
-(load "rudel-loaddefs.el")
+;; (load "rudel-loaddefs.el")
 
 (unless (server-running-p)
   (server-start))
 
+(diminish 'auto-fill-function "_")
+(ac-config-default)
+
 (provide 'init)
 
 ;;; init.el ends here