diff options
Diffstat (limited to '.emacs.d')
| -rw-r--r-- | .emacs.d/init.el | 14 | ||||
| -rw-r--r-- | .emacs.d/site-lisp/oni.el | 4 |
2 files changed, 7 insertions, 11 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 793ac7d..d1c7355 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -25,6 +25,8 @@ (require 'mode-icons) (require 'oni) +(defalias 'dabbrev-expand 'hippie-expand) + (autoload 'define-slime-contrib "slime") (autoload 'gtags-mode "gtags" nil t) (autoload 'identica-mode "identica-mode" nil t) @@ -40,9 +42,6 @@ (load (expand-file-name "~/.emacs.d/site-lisp/loaddefs.el")) -(define-key key-translation-map (kbd "C-j") (kbd "C-l")) -(define-key key-translation-map (kbd "C-l") (kbd "C-j")) - (defalias 'yes-or-no-p 'y-or-n-p) (defalias 'list-buffers 'ibuffer) @@ -283,7 +282,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) @@ -365,6 +363,9 @@ (add-to-list 'auto-mode-alist '("^PKGBUILD$" . shell-script-mode)) (add-to-list 'auto-mode-alist '("^\\.Xmodmap$" . xmodmap-mode)) +(add-to-list 'compilation-finish-functions + 'oni:compilation-finish-function) + (add-to-list 'debug-ignored-errors "^Can't shift all lines enough") (add-to-list 'display-buffer-alist @@ -402,6 +403,7 @@ (ido-ubiquitous-mode) (savehist-mode) (show-paren-mode) +(display-battery-mode) (smex-initialize) (help-at-pt-set-timer) @@ -410,10 +412,6 @@ (load custom-file) (load "rudel-loaddefs.el") -(load (expand-file-name "~/quicklisp/slime-helper.el")) - -(load "quick-edit-mode") -(global-set-key (kbd "C-z") 'quick-edit-mode) (unless (server-running-p) (server-start) diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index 2a27e45..9b02dc1 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -59,7 +59,7 @@ DOT are intentionally being skipped." (defvar oni:required-packages '(graphviz-dot-mode htmlize magit rainbow-delimiters - rainbow-mode yasnippet markdown-mode flymake + rainbow-mode markdown-mode flymake flymake-cursor pony-mode sauron dispass expand-region fill-column-indicator git-auto-commit-mode idomenu magit smex) @@ -175,7 +175,6 @@ DOT are intentionally being skipped." (defun oni:html-mode-func () "Function for `html-mode-hook'." - (yas-minor-mode) (fci-mode)) (defun oni:indent-shift-left (start end &optional count) @@ -398,7 +397,6 @@ When dealing with braces, add another line and indent that too." (rainbow-delimiters-mode) (fci-mode) (pretty-symbols-mode) - (yas-minor-mode) (auto-fill-mode)) (defun oni:python-mode-func () |