From 73298c40cd8ae014124e3e9ed0f2031cb18cf958 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Mon, 19 Nov 2012 23:22:27 +0100 Subject: .emacs.d/gnus.el --- .emacs.d/gnus.el | 5 ----- 1 file changed, 5 deletions(-) (limited to '.emacs.d') 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) -- cgit v1.2.3-54-g00ecf From c99d57dbf3c388661729091087fe2ced638cbc04 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Mon, 19 Nov 2012 23:22:51 +0100 Subject: .emacs.d/init.el --- .emacs.d/init.el | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to '.emacs.d') 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 -- cgit v1.2.3-54-g00ecf From 07be108b4ea6e89120948ea2cb10841be5616d4c Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Mon, 19 Nov 2012 23:23:13 +0100 Subject: .emacs.d/site-lisp/oni.el --- .emacs.d/site-lisp/oni.el | 7 +++++++ 1 file changed, 7 insertions(+) (limited to '.emacs.d') diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index a0aa003..bfdf369 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -273,6 +273,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 ")")) -- cgit v1.2.3-54-g00ecf From d027e718398b1f03644ac74bfbd1575a4e09845b Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Tue, 20 Nov 2012 18:53:28 +0100 Subject: .emacs.d/init.el --- .emacs.d/init.el | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to '.emacs.d') diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 6b20d31..ee23d0d 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -106,9 +106,6 @@ '(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)) @@ -273,9 +270,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) -- cgit v1.2.3-54-g00ecf From e2ed387df12186dba6f6e0c60044ae5d4d59aa20 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Tue, 20 Nov 2012 18:53:43 +0100 Subject: .emacs.d/site-lisp/oni.el --- .emacs.d/site-lisp/oni.el | 6 ++++++ 1 file changed, 6 insertions(+) (limited to '.emacs.d') diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index bfdf369..286f19b 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -402,6 +402,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) -- cgit v1.2.3-54-g00ecf