summaryrefslogtreecommitdiff
path: root/.emacs
diff options
context:
space:
mode:
Diffstat (limited to '.emacs')
-rw-r--r--.emacs11
1 files changed, 10 insertions, 1 deletions
diff --git a/.emacs b/.emacs
index 5944521..99bdf77 100644
--- a/.emacs
+++ b/.emacs
@@ -56,6 +56,10 @@
:load "identica-mode.el"
:after (lambda ()
(load-identica-mode)))
+ (:name nginx-mode
+ :description "Major mode for editing Nginx configuration files"
+ :type git
+ :url "git://github.com/ajc/nginx-mode.git")
(:name autopair
:after (lambda ()
(autopair-global-mode 1)
@@ -77,7 +81,10 @@
org-mode
identica-mode
smarttabs
- autopair))
+ markdown-mode
+ autopair
+ nginx-mode
+ ))
(when (require 'el-get nil t)
(el-get 'sync lts-el-get-packages))
@@ -184,6 +191,8 @@
(set (make-local-variable 'indent-tabs-mode) nil)
))
+(add-to-list 'auto-mode-alist '("PKGBUILD" . sh-mode))
+
;(require 'flymake)
;(add-hook 'php-mode-hook (lambda() (flymake-mode 1)))
;(define-key php-mode-map '[M-S-up] 'flymake-goto-prev-error)