summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2015-12-12 17:22:17 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2015-12-12 17:22:17 -0500
commit2ae901c981b699f7a8607a5ea6f6790ccbb0adb8 (patch)
tree1ff012598e7c1bb4ea917e4c2126ab28adb7f4e9
parent771d5a041a48b4ebf2c5ee8ff2fc98834a613843 (diff)
emacs: stuff
-rw-r--r--.config/emacs/custom.el3
-rw-r--r--.config/emacs/init.el3
2 files changed, 5 insertions, 1 deletions
diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el
index ef6e985..a099221 100644
--- a/.config/emacs/custom.el
+++ b/.config/emacs/custom.el
@@ -39,7 +39,8 @@
(quote
((Nginx-indent-tabs-mode)
(Nginx-indent-level . 4)
- (Nginx-indent-level . 8))))
+ (Nginx-indent-level . 8)
+ (c-set-style . "K&R"))))
'(scroll-bar-mode nil)
'(send-mail-function (quote smtpmail-send-it))
'(smtpmail-smtp-server "plus.smtp.mail.yahoo.com")
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index fe2400d..f1650a4 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -111,6 +111,7 @@
(:name haml-mode :type elpa)
(:name markdown-mode :type elpa
:after (add-to-list 'auto-mode-alist '("\\.ronn\\'" . markdown-mode)))
+ (:name mediawiki :type elpa)
(:name nginx-mode :type elpa
:after (put 'nginx-indent-level 'safe-local-variable 'integerp))
(:name scss-mode :type elpa)
@@ -138,6 +139,8 @@
graphviz-dot-mode
haml-mode
markdown-mode
+ yaml-mode
+ mediawiki
nginx-mode
php-mode-improved
scss-mode