summaryrefslogtreecommitdiff
path: root/.emacs.d
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-07-17 00:07:08 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-07-17 00:07:08 -0400
commit9399e46640c9c8f690c091f51749a7d3b5511646 (patch)
tree9e88b7b30be21db9ab561ede4b9777a74a12b995 /.emacs.d
parent4dcf99a241f8591b21ce3e8b2dd385cbeb99bbf6 (diff)
parentdbab2a06f142894f446f1f66b637242862dcd7bf (diff)
Merge branch 'master' of gitorious.org:lukeshu-dotfiles/lukeshu-dotfiles
Diffstat (limited to '.emacs.d')
-rw-r--r--.emacs.d/custom.el6
1 files changed, 3 insertions, 3 deletions
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