diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2015-12-06 23:56:13 -0500 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2015-12-06 23:56:13 -0500 |
| commit | ee2bc4b2d622b29870574a511cdbd6d7674c272d (patch) | |
| tree | e85584272af4903277bc583def873d7bf2391a4b /.config/emacs/init.el | |
| parent | f91736150e5b705d832ef9259a0ce30487da3637 (diff) | |
| parent | fd60f207ec451406885578e282bfb3cb252a58cc (diff) | |
Merge remote-tracking branch 'origin/master' into purdue-cs/master
# Conflicts:
# .config/X11/clientrc
# .config/emacs/init.el
Diffstat (limited to '.config/emacs/init.el')
| -rw-r--r-- | .config/emacs/init.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 39dcf0e..e0e39d4 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -105,6 +105,8 @@ (set (make-local-variable 'tab-width) 2) (set (make-local-variable 'indent-tabs-mode) nil) ))) + (:name glsl-mode :type elpa) + (:name go-mode :type elpa) (:name graphviz-dot-mode :type elpa) (:name haml-mode :type elpa) (:name markdown-mode :type elpa @@ -112,7 +114,6 @@ (:name nginx-mode :type elpa :after (put 'nginx-indent-level 'safe-local-variable 'integerp)) (:name scss-mode :type elpa) - (:name go-mode :type elpa) (:name yaml-mode :type elpa) )) ;; What packages el-get should install, both from above, and it's @@ -132,13 +133,14 @@ ;;nxhtml ; nxhtml is invasive, only enable if actively using bison-mode coffee-mode + glsl-mode + go-mode graphviz-dot-mode haml-mode markdown-mode nginx-mode php-mode-improved scss-mode - go-mode yaml-mode ))) @@ -328,3 +330,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)) +(put 'downcase-region 'disabled nil) |