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.el14
1 files changed, 6 insertions, 8 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index ee23d0d..b99ce68 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -23,6 +23,8 @@
(require 'ext)
(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)
@@ -38,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)
(defalias 'list-buffers 'ibuffer)
(defalias 'dabbrev-expand 'hippie-expand)
@@ -286,7 +285,6 @@
(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))
(add-hook 'after-save-hook 'oni:after-save-func t)
(add-hook 'before-save-hook 'oni:before-save-func)
@@ -368,6 +366,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
@@ -401,6 +402,7 @@
(ido-ubiquitous-mode)
(savehist-mode)
(show-paren-mode)
+(display-battery-mode)
(smex-initialize)
(help-at-pt-set-timer)
@@ -409,10 +411,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))