summaryrefslogtreecommitdiff
path: root/.config/emacs
diff options
context:
space:
mode:
Diffstat (limited to '.config/emacs')
-rw-r--r--.config/emacs/custom.el3
-rw-r--r--.config/emacs/init.el7
2 files changed, 7 insertions, 3 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 e0e39d4..f1650a4 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -75,7 +75,7 @@
;; 1) Disable package.el from getting loading all downloaded packages
;; 2) Use el-get to load a specified list of packages from elpa.
;;
-;; This is also nice because I can do event-base programming for what
+;; This is also nice because I can do event-based programming for what
;; to do once a package is loaded, using :after.
;; For some reason, el-get adds a bunch of 3rd-party repos to
@@ -111,12 +111,13 @@
(: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)
(:name yaml-mode :type elpa)
))
-;; What packages el-get should install, both from above, and it's
+;; What packages el-get should install, both from above, and its
;; internal list of sources.
(el-get 'sync (append
'(el-get)
@@ -138,6 +139,8 @@
graphviz-dot-mode
haml-mode
markdown-mode
+ yaml-mode
+ mediawiki
nginx-mode
php-mode-improved
scss-mode