From c99d57dbf3c388661729091087fe2ced638cbc04 Mon Sep 17 00:00:00 2001
From: Tom Willemsen <tom@ryuslash.org>
Date: Mon, 19 Nov 2012 23:22:51 +0100
Subject: [PATCH] .emacs.d/init.el

---
 .emacs.d/init.el | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 837f49f..6b20d31 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -43,6 +43,7 @@
 
 (defalias 'yes-or-no-p 'y-or-n-p)
 (defalias 'list-buffers 'ibuffer)
+(defalias 'dabbrev-expand 'hippie-expand)
 
 (defface git-commit-summary-face
   '((t (:inherit org-level-1)))
@@ -98,6 +99,9 @@
       '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\\." "^\\#")))
@@ -119,6 +123,9 @@
      (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))
+
 (put 'upcase-region 'disabled nil)
 (put 'downcase-region 'disabled nil)
 (put 'narrow-to-region 'disabled nil)
@@ -253,6 +260,7 @@
 (setq magit-repo-dirs '("~/var/src/"))
 (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/")
@@ -278,6 +286,7 @@
 (setq uniquify-buffer-name-style 'post-forward)
 (setq use-dialog-box nil)
 (setq user-full-name "Tom Willemsen")
+(setq user-mail-address "tom@ryuslash.org")
 (setq window-combination-resize t)
 (setq yas-prompt-functions '(yas-ido-prompt))
 
@@ -363,10 +372,6 @@
 
 (add-to-list 'debug-ignored-errors "^Can't shift all lines enough")
 
-(add-to-list 'display-buffer-alist
-             '(".*" . ((bw-display-in-other-window . nil))))
-(add-to-list 'display-buffer-alist
-             '("^\\*.*\\*$" . ((bw-display-in-bottom-window . nil))))
 (add-to-list 'display-buffer-alist
              '("^\\*magit: .*\\*$" . ((display-buffer-same-window . nil))))
 (add-to-list 'display-buffer-alist