diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-22 11:56:18 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-22 11:56:18 -0400 |
| commit | ec3ed4f68e9247e9e27c853bf104495027983881 (patch) | |
| tree | 7feccbbce429dfb18da452ae798ede6497e79dcb /.emacs.d | |
| parent | e9f7fef7880b7f37c9da0b2be5e1ab5b08b23f6c (diff) | |
| parent | 510fea7116c6bd01824af38b4e516b6e19fded81 (diff) | |
Merge branch 'master' of git://gitorious.org/lukeshu-dotfiles/lukeshu-dotfiles
Diffstat (limited to '.emacs.d')
| -rw-r--r-- | .emacs.d/.gitignore | 4 | ||||
| -rw-r--r-- | .emacs.d/custom.el | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/.emacs.d/.gitignore b/.emacs.d/.gitignore index 675a8be..ef4ec20 100644 --- a/.emacs.d/.gitignore +++ b/.emacs.d/.gitignore @@ -1,7 +1,9 @@ auto-save-list/* el-get/* -server/* elmo/* +elpa/* image-dired/* +server/* session.* +tramp url/* diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el index 0d4cf4a..ee82309 100644 --- a/.emacs.d/custom.el +++ b/.emacs.d/custom.el @@ -3,7 +3,11 @@ ;; 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. + '(custom-enabled-themes (quote (wombat))) + '(custom-safe-themes (quote ("71b172ea4aad108801421cc5251edb6c792f3adbaecfa1c52e94e3d99634dee7" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default))) '(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) |