diff options
Diffstat (limited to '.emacs.d')
| -rw-r--r-- | .emacs.d/init.el | 17 | ||||
| -rw-r--r-- | .emacs.d/site-lisp/oni.el | 4 | ||||
| -rw-r--r-- | .emacs.d/snippets/org-mode/heading | 10 |
3 files changed, 13 insertions, 18 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 61f14d7..a30a55c 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -13,8 +13,7 @@ (add-to-list 'load-path directory) (let ((default-directory directory)) (normal-top-level-add-subdirs-to-load-path))) - '("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp" - "/usr/local/emacs/share/emacs/site-lisp")) + '("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp")) (mapc #'(lambda (directory) (add-to-list 'load-path directory) (let ((loaddefs (concat directory "/loaddefs.el"))) @@ -33,6 +32,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) @@ -48,9 +49,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) @@ -298,7 +296,6 @@ (setq user-mail-address "tom@ryuslash.org") (setq w3m-fill-column 72) (setq window-combination-resize t) -(setq yas-prompt-functions '(yas-ido-prompt)) (add-hook 'after-change-major-mode-hook 'set-current-mode-icon) (add-hook 'after-save-hook 'oni:after-save-func t) @@ -388,6 +385,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 @@ -423,6 +423,7 @@ (ido-ubiquitous-mode) (savehist-mode) (show-paren-mode) +(display-battery-mode) (smex-initialize) (help-at-pt-set-timer) @@ -431,10 +432,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 f636587..b3a7987 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -189,7 +189,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) @@ -405,7 +404,7 @@ When dealing with braces, add another line and indent that too." "Function for `org-mode-hook'." (auto-fill-mode) (yas-minor-mode) - (setq-local comment-auto-fill-only-comments nil)) + (set (make-local-variable 'comment-auto-fill-only-comments) nil)) (defun oni:php-mode-func () "Function for `php-mode-hook'." @@ -427,7 +426,6 @@ length -1. Use the `-' character. WIN is ignored." (rainbow-delimiters-mode) (fci-mode) (pretty-symbols-mode) - (yas-minor-mode) (auto-fill-mode)) (defun oni:python-mode-func () diff --git a/.emacs.d/snippets/org-mode/heading b/.emacs.d/snippets/org-mode/heading index 9d5451e..48dca7f 100644 --- a/.emacs.d/snippets/org-mode/heading +++ b/.emacs.d/snippets/org-mode/heading @@ -2,8 +2,8 @@ # name: Heading # key: * # -- -${1:*} ${2:TODO} $3 -${1:$(make-string (length text) ?\ )} :PROPERTIES: -${1:$(make-string (length text) ?\ )} :CATEGORY: $4 -${1:$(make-string (length text) ?\ )} :END: -${1:$(make-string (length text) ?\ )} $0
\ No newline at end of file +*$1 ${2:TODO} $3 + ${1:$(make-string (length text) ?\ )} :PROPERTIES: + ${1:$(make-string (length text) ?\ )} :CATEGORY: $4 + ${1:$(make-string (length text) ?\ )} :END: + ${1:$(make-string (length text) ?\ )} $0
\ No newline at end of file |