diff options
Diffstat (limited to '.emacs.d')
-rw-r--r-- | .emacs.d/init.el | 12 | ||||
-rw-r--r-- | .emacs.d/site-lisp/oni.el | 13 |
2 files changed, 6 insertions, 19 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 4f78780..11a390d 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -40,9 +40,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) (eval-after-load "ebuff-menu" @@ -334,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) @@ -366,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) @@ -420,6 +415,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 @@ -465,10 +463,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) (provide 'init) diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index c483278..a480282 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) @@ -379,8 +378,7 @@ When dealing with braces, add another line and indent that too." (defun oni:org-mode-func () "Function for `org-mode-hook'." - (auto-fill-mode) - (yas-minor-mode)) + (auto-fill-mode)) (defun oni:php-mode-func () "Function for `php-mode-hook'." @@ -395,8 +393,7 @@ When dealing with braces, add another line and indent that too." "Function for `prog-mode-hook'." (rainbow-delimiters-mode) (fci-mode) - (pretty-symbols-mode) - (yas-minor-mode)) + (pretty-symbols-mode)) (defun oni:python-mode-func () "Function for `python-mode-hook'." @@ -552,9 +549,5 @@ for easy selection." "Function for `write-file-hooks'." (time-stamp)) -(defun oni:yas-minor-mode-func () - "Function for `yas-minor-mode-hook'." - (yas-load-directory (car yas-snippet-dirs))) - (provide 'oni) ;;; oni.el ends here |