diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-05-30 11:36:32 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-05-30 11:36:32 -0400 |
| commit | dbab2a06f142894f446f1f66b637242862dcd7bf (patch) | |
| tree | c8888e76f39647edad67abd73e74605b1d95b3aa /.emacs.d | |
| parent | bd8512e48b8ca0f44171c06578da7a5f3cd6663f (diff) | |
| parent | 344bd61ba0d7d06b3cec6499ef6b4058f9d64626 (diff) | |
Merge branch 'master' of gitorious.org:lukeshu-dotfiles/lukeshu-dotfiles
Conflicts:
.emacs
.emacs.d/custom.el
Diffstat (limited to '.emacs.d')
| -rw-r--r-- | .emacs.d/.gitignore | 2 | ||||
| -rw-r--r-- | .emacs.d/custom.el | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/.emacs.d/.gitignore b/.emacs.d/.gitignore index 60dcaa6..675a8be 100644 --- a/.emacs.d/.gitignore +++ b/.emacs.d/.gitignore @@ -1,5 +1,7 @@ auto-save-list/* el-get/* server/* +elmo/* image-dired/* session.* +url/* diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el index 7773d83..4caf4c5 100644 --- a/.emacs.d/custom.el +++ b/.emacs.d/custom.el @@ -5,6 +5,8 @@ ;; If there is more than one, they won't work right. '(ruby-deep-arglist nil) '(ruby-deep-indent-paren nil) + '(erc-nick "lukeshu") + '(mdmua-maildir "~/Maildir") '(scroll-bar-mode nil)) (custom-set-faces ;; custom-set-faces was added by Custom. |