summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.emacs13
-rw-r--r--.emacs.d/custom.el6
2 files changed, 15 insertions, 4 deletions
diff --git a/.emacs b/.emacs
index 4bc39b3..99bdf77 100644
--- a/.emacs
+++ b/.emacs
@@ -179,8 +179,19 @@
(setq autopair-dont-activate t) ;; Don't let autopair break ansi-term
))
-(add-to-list 'auto-mode-alist '("PKGBUILD" . sh-mode))
+(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)
+ ))
+
+(add-to-list 'auto-mode-alist '("PKGBUILD" . sh-mode))
;(require 'flymake)
;(add-hook 'php-mode-hook (lambda() (flymake-mode 1)))
diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el
index 9f61215..4caf4c5 100644
--- a/.emacs.d/custom.el
+++ b/.emacs.d/custom.el
@@ -3,9 +3,9 @@
;; 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.
- '(erc-nick "lukeshu-freenode")
- '(erc-port 6667)
- '(erc-server "lukeshu.ath.cx")
+ '(ruby-deep-arglist nil)
+ '(ruby-deep-indent-paren nil)
+ '(erc-nick "lukeshu")
'(mdmua-maildir "~/Maildir")
'(scroll-bar-mode nil))
(custom-set-faces