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

Conflicts:
	.xinitrc

1 files changed, 18 insertions, 9 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 205aad0..11a390d 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -88,6 +88,9 @@
 (eval-after-load "info"
   '(require 'info+))
 
+(eval-after-load "jabber"
+  '(remove-hook 'jabber-alert-presence-hooks 'jabber-presence-echo))
+
 (eval-after-load "org"
   '(progn
      (require 'appt)
@@ -172,14 +175,17 @@
 (setq flymake-gui-warnings-enabled nil)
 (setq flymake-info-line-regexp
       (eval-when-compile
-        (regexp-opt '("Invalid name"))))
+        (regexp-opt '("Invalid name"
+                      "Missing docstring"
+                      "multiple imports on one line"
+                      "expected 2 blank lines, found 1"
+                      "TODO:"))))
 (setq flymake-log-file-name (expand-file-name "~/.emacs.d/flymake.log"))
 (setq flymake-log-level 0)
 (setq flymake-warn-line-regexp
       (eval-when-compile
         (regexp-opt '("warning"
                       "Warning"
-                      "Missing docstring"
                       "String statement has no effect"
                       "No value passed for parameter"
                       "imported but unused"))))
@@ -208,7 +214,7 @@
 (setq jabber-history-dir "~/.emacs.d/jabber")
 (setq jabber-roster-show-bindings nil)
 (setq jit-lock-defer-time 0.2)
-(setq mail-header-separator "")
+(setq magit-repo-dirs '("~/var/src/"))
 (setq message-log-max 1000)
 (setq message-send-mail-function 'message-send-mail-with-sendmail)
 (setq mode-line-position nil)
@@ -227,10 +233,10 @@
                                (oni:email ryuslash at ninthfloor dot org)
                                (oni:email thomas at aethon dot nl)))
 (setq org-agenda-custom-commands
-      '(("b" "Bookmarks to look at."
-         todo "LOOKAT")
-        ("w" "Work todo."
-         tags-todo "CATEGORY=\"Work\"")))
+      '(("wt" "Work todo."
+         tags-todo "CATEGORY=\"Work\"")
+        ("wm" "Myaethon2 todo."
+         tags-todo "CATEGORY=\"myaethon2\"")))
 (setq org-agenda-sorting-strategy
       '((agenda habit-down time-up priority-down category-keep)
         (todo priority-down category-up)
@@ -325,7 +331,6 @@
 (setq user-full-name "Tom Willemsen")
 (setq whitespace-style '(face trailing))
 (setq window-combination-resize t)
-(setq yas-prompt-functions '(yas-ido-prompt))
 
 (add-hook 'after-save-hook 'oni:after-save-func t)
 (add-hook 'before-save-hook 'oni:before-save-func)
@@ -339,6 +344,7 @@
 (add-hook 'go-mode-hook 'oni:go-mode-func)
 (add-hook 'gtags-mode-hook 'oni:gtags-mode-func)
 (add-hook 'html-mode-hook 'oni:html-mode-func)
+(add-hook 'jabber-alert-message-hooks 'oni:jabber-alert-message-func)
 (add-hook 'jabber-chat-mode-hook 'oni:jabber-chat-mode-func)
 (add-hook 'jabber-roster-mode-hook 'oni:jabber-roster-mode-func)
 (add-hook 'java-mode-hook 'oni:java-mode-func)
@@ -356,7 +362,6 @@
 (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)
@@ -366,6 +371,7 @@
 (global-set-key (kbd "<XF86HomePage>") 'oni:raise-scratch)
 (global-set-key (kbd "<XF86Mail>") 'oni:view-mail)
 (global-set-key (kbd "<XF86Tools>") 'oni:start-emms)
+(global-set-key (kbd "<f10>") 'git-project-show-files)
 (global-set-key (kbd "<f5>") 'ext:reload-buffer)
 (global-set-key (kbd "<f6>") 'jabber-switch-to-roster-buffer)
 (global-set-key (kbd "<f7>") 'magit-status)
@@ -382,6 +388,7 @@
 (global-set-key (kbd "C-c c") 'org-capture)
 (global-set-key (kbd "C-c i p") 'identica-update-status-interactive)
 (global-set-key (kbd "C-c p") 'oni:show-buffer-position)
+(global-set-key (kbd "C-c t") 'ansi-term)
 (global-set-key (kbd "C-d") 'oni:kill-region-or-forward-char)
 (global-set-key (kbd "C-e") 'oni:move-end-of-dwim)
 (global-set-key (kbd "C-k") 'oni:kill-region-or-line)
@@ -419,6 +426,8 @@
              '("^\\*.*\\*$" . ((bw-display-in-bottom-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)