Merge branch 'master' of gitorious.org:lukeshu-dotfiles/lukeshu-dotfiles

Conflicts:
	.emacs

2 files changed, 20 insertions, 0 deletions

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.
+ )