diff options
| author |  Tom Willemsen | 2012-09-17 20:32:32 +0200 |
|---|---|---|
| committer | Tom Willemsen | 2012-09-17 20:32:32 +0200 |
| commit | 1a767eeab08efee8ca5d5d26e946b0cae54b203e (patch) | |
| tree | d080eca0db5cff01da2d03d20c6e65b4f8c3fdf8 /.emacs.d | |
| parent | aa949b255f4dc3ef4b129491ea3a19a3254158ba (diff) | |
| parent | d6c8f4f979448576ff2041bda13b963999e03626 (diff) | |
| download | dotfiles-1a767eeab08efee8ca5d5d26e946b0cae54b203e.tar.gz dotfiles-1a767eeab08efee8ca5d5d26e946b0cae54b203e.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Diffstat (limited to '.emacs.d')
| -rw-r--r-- | .emacs.d/init.el | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el index f7dd9f0..68e0ca8 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -21,8 +21,6 @@ '("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp")) (add-to-list 'load-path "~/.emacs.d/")) -(require 'auto-complete-config) - (autoload 'define-slime-contrib "slime") (autoload 'gtags-mode "gtags" nil t) (autoload 'identica-mode "identica-mode" nil t) @@ -563,7 +561,7 @@ use. If MODE is not nil, open a new buffer with the name (when (fboundp mode-sym) (funcall mode-sym)))) - (switch-to-buffer buffer))) + (select-window (display-buffer buffer)))) (defun oni:reload-buffer () "Reload current buffer." @@ -807,7 +805,6 @@ for easy selection." (setq-default tab-width 4) (setq-default truncate-lines t) -(setq ac-use-quick-help nil) (setq appt-display-diary nil) (setq auto-mode-case-fold nil) (setq auto-save-file-name-transforms @@ -825,12 +822,11 @@ for easy selection." (vertical-scroll-bars . nil) (menu-bar-lines . nil) (tool-bar-lines . nil) - (font . "osaka_unicode:pixelsize=18") + (font . "Monaco:pixelsize=16") (left-fringe . 0))) (setq emms-source-file-default-directory "/mnt/music/") (setq erc-autojoin-channels-alist - '(("freenode.net" "#herbstluftwm" "#ninthfloor" "#emacs" - "#dispass"))) + '(("freenode.net" "#ninthfloor" "#emacs" "#dispass"))) (setq erc-hide-list '("JOIN" "PART" "QUIT")) (setq erc-insert-timestamp-function 'erc-insert-timestamp-left) (setq erc-nick "ryuslash") @@ -1000,6 +996,7 @@ for easy selection." (add-hook 'hs-minor-mode-hook 'oni:hs-minor-mode-func) (add-hook 'html-mode-hook 'oni:html-mode-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) (add-hook 'js-mode-hook 'oni:js-mode-func) (add-hook 'js2-mode-hook 'oni:js2-mode-func) @@ -1070,6 +1067,9 @@ for easy selection." (add-to-list 'debug-ignored-errors "^Can't shift all lines enough") +(add-to-list 'display-buffer-alist + '("^\\*.*\\*$" . ((bw-display-in-bottom-window . nil)))) + (unless (oni:required-packages-installed-p) (message "%s" "Refreshing package database...") (package-refresh-contents) @@ -1095,7 +1095,6 @@ for easy selection." (smex-initialize) (help-at-pt-set-timer) -(ac-config-default) (load-theme 'naquadah t) |