From a3ec17efcbf8f41cec14ca95ff339b2aad2453c2 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Tue, 6 Mar 2012 16:34:51 -0500
Subject: update my .emacs el-get (some things have hit upstream, remove magit)

---
 .emacs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.emacs b/.emacs
index 805b4c3..34967b3 100644
--- a/.emacs
+++ b/.emacs
@@ -36,7 +36,6 @@
                :after (lambda ()
                         (color-theme-tty-dark)))
         (:name color-theme-solarized
-               :url "git://github.com/LukeShu/emacs-color-theme-solarized.git"
                :after (lambda ()
                         (add-hook 'after-make-frame-functions
                                   (lambda (frame)
@@ -46,8 +45,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)
@@ -59,8 +56,6 @@
                :load "identica-mode.el"
                :after (lambda ()
                         (load-identica-mode)))
-        (:name smarttabs
-               :url "git://gist.github.com/896190.git")
         (:name autopair
                :after (lambda ()
                         (autopair-global-mode 1)
@@ -74,7 +69,6 @@
         php-mode-improved
         mmm-mode
         dtrt-indent
-        magit
         coffee-mode
         folding
         apel flim semi wanderlust
-- 
cgit v1.2.3


From 344bd61ba0d7d06b3cec6499ef6b4058f9d64626 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Tue, 22 May 2012 23:49:54 -0400
Subject: don't use a different .git.info.exclude for the generic brach

---
 .git.info.exclude | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.git.info.exclude b/.git.info.exclude
index bc11313..235367c 100644
--- a/.git.info.exclude
+++ b/.git.info.exclude
@@ -100,9 +100,3 @@ history.*
 .config/transmission
 .netbeans
 .mozilla
-
-# Ignore these platform-specific files
-.full.asound
-.xmodmap
-*.local
-*_local
-- 
cgit v1.2.3


From bd8512e48b8ca0f44171c06578da7a5f3cd6663f Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 30 May 2012 11:33:27 -0400
Subject: Merge branch 'master' of
 gitorious.org:lukeshu-dotfiles/lukeshu-dotfiles

Conflicts:
	.emacs
---
 .emacs             | 12 ++++++++++++
 .emacs.d/custom.el |  8 ++++++++
 2 files changed, 20 insertions(+)

diff --git a/.emacs b/.emacs
index 34967b3..5944521 100644
--- a/.emacs
+++ b/.emacs
@@ -172,6 +172,18 @@
              (setq autopair-dont-activate t) ;; Don't let autopair break ansi-term
              ))
 
+(add-hook 'ruby-mode-hook
+          '(lambda ()
+             (set (make-local-variable 'indent-tabs-mode) t)
+             (set (make-local-variable 'ruby-indent-level) 4)
+             (set (make-local-variable 'tab-width) 4)
+             ))
+
+(add-hook 'coffee-mode-hook
+          '(lambda ()
+             (set (make-local-variable 'indent-tabs-mode) nil)
+             ))
+
 ;(require 'flymake)
 ;(add-hook 'php-mode-hook (lambda() (flymake-mode 1)))
 ;(define-key php-mode-map '[M-S-up] 'flymake-goto-prev-error)
diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el
index d8fdce4..7773d83 100644
--- a/.emacs.d/custom.el
+++ b/.emacs.d/custom.el
@@ -3,4 +3,12 @@
   ;; If you edit it by hand, you could mess it up, so be careful.
   ;; Your init file should contain only one such instance.
   ;; If there is more than one, they won't work right.
+ '(ruby-deep-arglist nil)
+ '(ruby-deep-indent-paren nil)
  '(scroll-bar-mode nil))
+(custom-set-faces
+  ;; custom-set-faces was added by Custom.
+  ;; If you edit it by hand, you could mess it up, so be careful.
+  ;; Your init file should contain only one such instance.
+  ;; If there is more than one, they won't work right.
+ )
-- 
cgit v1.2.3