diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-03-14 00:15:18 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-03-14 00:15:18 -0400 |
commit | 165b849169b85ee86d0b07dc56012efcec2b0eba (patch) | |
tree | 229383422990c37bd1cc918891b300cccbf57c3f /.config/emacs/init.el | |
parent | 66c5faa2bce8809a1e7e90eec0542b4de07915df (diff) | |
parent | db32e22df76eaa0b1c3eed59c64232a724d26913 (diff) |
Merge remote-tracking branch 'origin/master' into build64-par/master
Diffstat (limited to '.config/emacs/init.el')
-rw-r--r-- | .config/emacs/init.el | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 5429c08..5f399a0 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -95,6 +95,7 @@ (smart-tabs-mode 1) (apply 'smart-tabs-insinuate (mapcar 'car smart-tabs-insinuate-alist)))) ;; Major modes + (:name bison-mode :type elpa) (:name coffee-mode :type elpa :after (add-hook 'coffee-mode-hook '(lambda () @@ -102,6 +103,7 @@ (set (make-local-variable 'indent-tabs-mode) nil) ))) (:name graphviz-dot-mode :type elpa) + (:name haml-mode :type elpa) (:name markdown-mode :type elpa :after (add-to-list 'auto-mode-alist '("\\.ronn\\'" . markdown-mode))) (:name nginx-mode :type elpa @@ -113,15 +115,19 @@ (el-get 'sync '(el-get ;; Minor modes dtrt-indent - smart-tabs-mode page-break-lines + smart-tabs-mode ;; Major modes - apel flim semi wanderlust + ;;apel flim semi wanderlust ; wanderlust is huge, only use on emailing boxes + ;;nxhtml ; nxhtml is invasive, only enable if actively using + bison-mode + coffee-mode graphviz-dot-mode + haml-mode markdown-mode nginx-mode - ;;nxhtml ; nxhtml is invasive, only enable if actively using php-mode-improved + scss-mode )) |