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

3 files changed, 24 insertions, 13 deletions

diff --git a/.emacs.d/gnus.el b/.emacs.d/gnus.el
index a13a1ad..03f1b41 100644
--- a/.emacs.d/gnus.el
+++ b/.emacs.d/gnus.el
@@ -14,9 +14,6 @@
 (setq gnus-read-newsrc-file nil)
 (setq gnus-novice-user t)
 (setq gnus-article-truncate-lines nil)
-(setq message-send-mail-function 'message-send-mail-with-sendmail)
-(setq sendmail-program "/usr/bin/msmtp")
-(setq message-sendmail-extra-arguments '("-a" "gmail"))
 ;; (setq gnus-parameters
 ;;       '(("gmail"
 ;;          (display . all))
@@ -51,8 +48,6 @@
          (signature-file "~/documents/work/aethon/signature.txt")
          (eval (setq message-sendmail-extra-arguments '("-a" "aethon")
                      flyspell-default-dictionary "nl")))))
-(setq user-mail-address "tom@ryuslash.org")
-(setq user-full-name "Tom Willemsen")
 
 ;-----[ BBDB ]--------------------------------------------------------
 ;; (require 'bbdb)
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 6af7c3e..b99ce68 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -42,6 +42,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)))
@@ -97,13 +98,13 @@
       '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\\." "^\\#")))
 
-(eval-after-load "info"
-  '(require 'info+))
-
 (eval-after-load "jabber"
   '(remove-hook 'jabber-alert-presence-hooks 'jabber-presence-echo))
 
@@ -118,6 +119,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)
@@ -252,6 +256,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/")
@@ -264,9 +269,10 @@
 (setq php-function-call-face 'font-lock-function-name-face)
 (setq php-mode-force-pear t)
 (setq pony-tpl-indent-moves t)
+(setq pp^L-^L-string-function 'oni:pretty-control-l-function)
+(setq pp^L-^L-string-pre nil)
 (setq rainbow-delimiters-max-face-count 12)
 (setq redisplay-dont-pause t)
-(setq scroll-conservatively 101)
 (setq send-mail-function 'smtpmail-send-it)
 (setq sendmail-program "/usr/bin/msmtp")
 (setq smex-key-advice-ignore-menu-bar t)
@@ -277,6 +283,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)
 
 (add-hook 'after-save-hook 'oni:after-save-func t)
@@ -365,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
              '("^\\*git-project-list\\*$" . ((git-project-show-window . nil))))
diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el
index 439be25..251dca2 100644
--- a/.emacs.d/site-lisp/oni.el
+++ b/.emacs.d/site-lisp/oni.el
@@ -272,6 +272,13 @@ If COUNT has been specified indent by that much, otherwise look at
       (kill-region (region-beginning) (region-end))
     (kill-line)))
 
+(defun oni:load-hippie-exp (other)
+  "Make sure both hippie-expand and yasnippet are loaded in order
+  to add yasnippet's expand function to hippie-expand."
+  (require other)
+  (add-to-list 'hippie-expand-try-functions-list
+               'yas/hippie-try-expand))
+
 (defun oni:lua-mode-func()
   "Function for `lua-mode-hook'."
   (local-unset-key (kbd ")"))
@@ -394,6 +401,12 @@ When dealing with braces, add another line and indent that too."
   (rainbow-delimiters-mode)
   (setq fci-rule-column 80))
 
+(defun oni:pretty-control-l-function (win)
+  "Just make a string of either `fci-rule-colum' or `fill-column'
+length -1.  Use the `-' character.  WIN is ignored."
+  (make-string
+   (1- (if (boundp 'fci-rule-column) fci-rule-column fill-column)) ?-))
+
 (defun oni:prog-mode-func ()
   "Function for `prog-mode-hook'."
   (rainbow-delimiters-mode)