diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-20 19:37:22 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-20 19:37:22 -0400 |
| commit | 92cc88c0668655155e9b63d8f43f51b12410fdff (patch) | |
| tree | 8f4d21ec67e5045585bc7acb6baf7b12494a7f89 /.config/emacs/init.el | |
| parent | 278000a3b8a64fd000ddd8198f76bd2bf78e4557 (diff) | |
| parent | a9fb80359a3e84ed7b64d3ecdf699acc5e53abc9 (diff) | |
Merge branch 'master' into build64-par/master
Diffstat (limited to '.config/emacs/init.el')
| -rw-r--r-- | .config/emacs/init.el | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el index eddd0b7..e14d0f5 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -237,6 +237,16 @@ sh-script.el is broken." (smerge-mode 1)))) (add-hook 'find-file-hook 'try-smerge-mode t) +;; http://www.emacswiki.org/emacs/XModMapMode +(when (not (fboundp 'xmodmap-mode)) + (define-generic-mode 'xmodmap-mode + '(?!) + '("add" "clear" "keycode" "keysym" "pointer" "remove") + nil + '("[xX]modmap\\(rc\\)?\\'") + nil + "Simple mode for xmodmap files.")) + ;; All my weird mode-specific settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -287,3 +297,4 @@ sh-script.el is broken." (add-to-list 'auto-mode-alist '("PKGBUILD" . sh-mode)) (add-to-list 'auto-mode-alist '("SRCBUILD" . sh-mode)) +(add-to-list 'auto-mode-alist '("\\.jad\\'" . java-mode)) |