diff options
Diffstat (limited to '.config/emacs/init.el')
| -rw-r--r-- | .config/emacs/init.el | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el index f1650a4..9fe3b9c 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -99,6 +99,7 @@ (mapcar 'car smart-tabs-insinuate-alist)))) ;; Major modes (:name bison-mode :type elpa) + (:name cmake-mode :type elpa) (:name coffee-mode :type elpa :after (add-hook 'coffee-mode-hook '(lambda () @@ -107,6 +108,7 @@ ))) (:name glsl-mode :type elpa) (:name go-mode :type elpa) + (:name gradle-mode :type elpa) (:name graphviz-dot-mode :type elpa) (:name haml-mode :type elpa) (:name markdown-mode :type elpa @@ -116,6 +118,7 @@ :after (put 'nginx-indent-level 'safe-local-variable 'integerp)) (:name scss-mode :type elpa) (:name yaml-mode :type elpa) + (:name editorconfig :type elpa) )) ;; What packages el-get should install, both from above, and its ;; internal list of sources. @@ -125,6 +128,7 @@ '(dtrt-indent page-break-lines smart-tabs-mode + editorconfig ) ;; Major modes (if (file-exists-p "~/Maildir") ; wanderlust is huge, only use on emailing boxes @@ -133,13 +137,14 @@ '( ;;nxhtml ; nxhtml is invasive, only enable if actively using bison-mode + cmake-mode coffee-mode glsl-mode go-mode + gradle-mode graphviz-dot-mode haml-mode markdown-mode - yaml-mode mediawiki nginx-mode php-mode-improved @@ -206,6 +211,10 @@ sh-script.el is broken." (if xterm-mouse-mode (xterm-mouse-mode 1)) ))) +;; Make TRAMP obey ~/.ssh/config for ControlMaster. For some reason, +;; customize doesn't correctly set this. +(setq tramp-use-ssh-controlmaster-options nil) + ;; Use mailcrypt to encrypt/decrypt email (when (require 'mailcrypt nil t) (mc-setversion "gpg") |