diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-05-30 11:36:32 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-05-30 11:36:32 -0400 |
commit | dbab2a06f142894f446f1f66b637242862dcd7bf (patch) | |
tree | c8888e76f39647edad67abd73e74605b1d95b3aa /.emacs | |
parent | bd8512e48b8ca0f44171c06578da7a5f3cd6663f (diff) | |
parent | 344bd61ba0d7d06b3cec6499ef6b4058f9d64626 (diff) |
Merge branch 'master' of gitorious.org:lukeshu-dotfiles/lukeshu-dotfiles
Conflicts:
.emacs
.emacs.d/custom.el
Diffstat (limited to '.emacs')
-rw-r--r-- | .emacs | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -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) |