summaryrefslogtreecommitdiffstats
path: root/.emacs.d/init.el
diff options
context:
space:
mode:
Diffstat (limited to '.emacs.d/init.el')
-rw-r--r--.emacs.d/init.el12
1 files changed, 3 insertions, 9 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)