diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-05-30 11:33:27 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-05-30 11:33:27 -0400 |
| commit | bd8512e48b8ca0f44171c06578da7a5f3cd6663f (patch) | |
| tree | ccb332930f934c8966678dc7cd926f7fc996dc76 /.emacs.d | |
| parent | a3ec17efcbf8f41cec14ca95ff339b2aad2453c2 (diff) | |
Merge branch 'master' of gitorious.org:lukeshu-dotfiles/lukeshu-dotfiles
Conflicts:
.emacs
Diffstat (limited to '.emacs.d')
| -rw-r--r-- | .emacs.d/custom.el | 8 |
1 files changed, 8 insertions, 0 deletions
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. + ) |