From 7dc3ebbcc158ba900e11a9398635ef840e389a9e Mon Sep 17 00:00:00 2001
From: Tom Willemsen <tom@ryuslash.org>
Date: Tue, 27 Nov 2012 11:12:17 +0100
Subject: [PATCH] .emacs.d/init.el

---
 .emacs.d/init.el | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index ee23d0d..dbf4e69 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -3,11 +3,6 @@
 ;;; Commentary:
 ;; Does so much and changes so often
 
-(require 'geiser-install)
-(require 'iso-transl)
-(require 'newcomment)
-(require 'uniquify)
-(require 'w3m-load)
 
 ;;; Code:
 
@@ -20,6 +15,11 @@
               (normal-top-level-add-subdirs-to-load-path)))
         '("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp")))
 
+(require 'geiser-install)
+(require 'iso-transl)
+(require 'newcomment)
+(require 'uniquify)
+(require 'w3m-load)
 (require 'ext)
 (require 'oni)
 
@@ -158,7 +158,8 @@
    (arglist-close . 0)
    (inline-open . 0)
    (brace-list-open . +)
-   (topmost-intro-cont first c-lineup-topmost-intro-cont c-lineup-gnu-DEFUN-intro-cont)))
+   (topmost-intro-cont first c-lineup-topmost-intro-cont
+                       c-lineup-gnu-DEFUN-intro-cont)))
 (setq comment-auto-fill-only-comments t)
 (setq custom-file "~/.emacs.d/custom.el")
 (setq custom-theme-directory "~/.emacs.d/themes")
@@ -168,7 +169,7 @@
         (vertical-scroll-bars . nil)
         (menu-bar-lines . nil)
         (tool-bar-lines . nil)
-        (font . "Monaco:pixelsize=16")))
+        (font . "monaco-12")))
 (setq emms-source-file-default-directory "/mnt/music/")
 (setq erc-autojoin-channels-alist
       '(("freenode.net" "#ninthfloor" "#emacs" "#dispass")))
@@ -285,6 +286,7 @@
 (setq use-dialog-box nil)
 (setq user-full-name "Tom Willemsen")
 (setq user-mail-address "tom@ryuslash.org")
+(setq w3m-fill-column 72)
 (setq window-combination-resize t)
 (setq yas-prompt-functions '(yas-ido-prompt))
 
@@ -318,6 +320,7 @@
 (add-hook 'term-mode-hook 'oni:term-mode-func)
 (add-hook 'texinfo-mode-hook 'oni:texinfo-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 "<XF86AudioNext>") 'emms-next)
@@ -361,7 +364,8 @@
 
 (add-to-list 'auto-mode-alist '("\\.jl$" . sawfish-mode))
 (add-to-list 'auto-mode-alist '("\\.js\\(on\\)?$" . js2-mode))
-(add-to-list 'auto-mode-alist '("\\.m\\(ark\\)?d\\(?:o?wn\\)?$" . markdown-mode))
+(add-to-list 'auto-mode-alist
+             '("\\.m\\(ark\\)?d\\(?:o?wn\\)?$" . markdown-mode))
 (add-to-list 'auto-mode-alist '("\\.php[345]?$" . php-mode))
 (add-to-list 'auto-mode-alist '("\\.po\\'\\|\\.po\\." . po-mode))
 (add-to-list 'auto-mode-alist '("\\.tpl$" . html-mode))
@@ -370,10 +374,12 @@
 
 (add-to-list 'debug-ignored-errors "^Can't shift all lines enough")
 
-(add-to-list 'display-buffer-alist
-             '("^\\*magit: .*\\*$" . ((display-buffer-same-window . nil))))
-(add-to-list 'display-buffer-alist
-             '("^\\*git-project-list\\*$" . ((git-project-show-window . nil))))
+(add-to-list
+ 'display-buffer-alist
+ '("^\\*magit: .*\\*$" . ((display-buffer-same-window . nil))))
+(add-to-list
+ 'display-buffer-alist
+ '("^\\*git-project-list\\*$" . ((git-project-show-window . nil))))
 
 (delete "   " mode-line-format)