diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-21 22:39:19 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-21 22:39:19 -0400 |
| commit | bc4a3914db8b294238df438750863214bdb83f4d (patch) | |
| tree | 18d1023524b22ea2eee292a8ba603cece46d9768 /.emacs.d | |
| parent | ae33398b4eefc8fd729c201c984126960d579afc (diff) | |
| parent | 69e7a06e976bbad54684b8c650853020c8352adb (diff) | |
Merge branch 'master' into hp-dv6426us-par
Conflicts:
.emacs.d/custom.el
Diffstat (limited to '.emacs.d')
| -rw-r--r-- | .emacs.d/custom.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el index fad97a8..ee82309 100644 --- a/.emacs.d/custom.el +++ b/.emacs.d/custom.el @@ -8,6 +8,7 @@ '(erc-nick "lukeshu") '(explicit-shell-file-name "/bin/bash") '(inhibit-startup-screen t) + '(mdmua-maildir "~/Maildir") '(ruby-deep-arglist nil) '(ruby-deep-indent-paren nil) '(scroll-bar-mode nil)) |