diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-04-11 23:01:21 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-04-11 23:01:21 -0400 |
commit | 6c0a5af3aba9902206a73a62e2be2e4dd67be9da (patch) | |
tree | cbc0dbb938716a80cc0248b5aff97dc34f21c756 /.emacs | |
parent | ebc4f813d517d44ddf7440fd8043c5d41adf8932 (diff) | |
parent | a96ee608ce4be813ce381a6a0c195591f633986e (diff) |
Merge branch 'hp-dv6426us-par' into identica-mode-1.2hp-dv6426us-par/identica-mode-1.2
Conflicts:
.emacs
Diffstat (limited to '.emacs')
-rw-r--r-- | .emacs | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -28,7 +28,6 @@ :after (lambda () (color-theme-tty-dark))) (:name color-theme-solarized - :url "https://LukeShu@github.com/LukeShu/emacs-color-theme-solarized.git" :after (lambda () (add-hook 'after-make-frame-functions (lambda (frame) @@ -38,8 +37,6 @@ (color-theme-solarized-dark) (color-theme-tty-dark)))))) (:name org-mode - :url "git://orgmode.org/org-mode.git" - :features org-install :after (lambda () (require 'org-checklist) (setq org-hide-leading-stars t) @@ -64,7 +61,6 @@ php-mode-improved mmm-mode dtrt-indent - magit coffee-mode folding apel flim semi wanderlust @@ -73,7 +69,9 @@ org-mode identica-mode smarttabs - autopair)) + markdown-mode + autopair + )) (when (require 'el-get nil t) (el-get 'sync lts-el-get-packages)) @@ -168,6 +166,9 @@ (setq autopair-dont-activate t) ;; Don't let autopair break ansi-term )) +(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) |