summaryrefslogtreecommitdiff
path: root/.emacs
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2011-11-13 15:17:27 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2011-11-13 15:17:27 -0500
commit86e56415e8c8081c99b99209182a6b5b34361d74 (patch)
tree2fd7d5db2e9d311a031326b519af6d552dac521d /.emacs
parentd1fc37acc5294e94d9a4add0d13a02841b22444c (diff)
parentfa0728204665d9d985f212826be65a563312e7e6 (diff)
Merge branch 'master' of gitorious.org:lukeshu-dotfiles/lukeshu-dotfiles
Diffstat (limited to '.emacs')
-rw-r--r--.emacs33
1 files changed, 21 insertions, 12 deletions
diff --git a/.emacs b/.emacs
index d2c5323..09c80f8 100644
--- a/.emacs
+++ b/.emacs
@@ -28,17 +28,7 @@
(eval-print-last-sexp))))
(setq el-get-sources
- '(el-get
- package
- rainbow-delimiters
- php-mode-improved
- mmm-mode
- dtrt-indent
- magit
- coffee-mode
- folding
- apel flim semi wanderlust
- (:name scss-mode
+ '((:name scss-mode
:url "git://github.com/antonj/scss-mode.git"
:after (lambda ()
(setq scss-compile-at-save nil)))
@@ -76,8 +66,27 @@
(autopair-global-mode 1)
(setq autopair-autowrap t)))
))
+
+(setq lts-el-get-packages
+ '(el-get
+ package
+ rainbow-delimiters
+ php-mode-improved
+ mmm-mode
+ dtrt-indent
+ magit
+ coffee-mode
+ folding
+ apel flim semi wanderlust
+ scss-mode
+ color-theme color-theme-solarized
+ org-mode
+ identica-mode
+ smarttabs
+ autopair))
+
(when (require 'el-get nil t)
- (el-get 'sync))
+ (el-get 'sync lts-el-get-packages))
(add-hook 'text-mode-hook 'turn-on-auto-fill)
(add-hook 'after-make-frame-functions