diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-22 20:44:04 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-22 20:44:04 -0400 |
| commit | ad482d55d2f60cf3c91c9014b934af7ea30b4d88 (patch) | |
| tree | 79bb00ec5be01214f1ebc99509308f2083c17717 /.emacs.d | |
| parent | 2f550711d01c7aa731d75edca9bc4d2a1f718045 (diff) | |
| parent | 510fea7116c6bd01824af38b4e516b6e19fded81 (diff) | |
Merge branch 'master' into build64-par
Conflicts:
.crontab
Diffstat (limited to '.emacs.d')
| -rw-r--r-- | .emacs.d/.gitignore | 4 | ||||
| -rw-r--r-- | .emacs.d/custom.el | 26 |
2 files changed, 18 insertions, 12 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 9f61215..ee82309 100644 --- a/.emacs.d/custom.el +++ b/.emacs.d/custom.el @@ -1,16 +1,20 @@ (custom-set-variables - ;; custom-set-variables 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. - '(erc-nick "lukeshu-freenode") - '(erc-port 6667) - '(erc-server "lukeshu.ath.cx") + ;; custom-set-variables 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. + '(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) '(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. + ;; 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. ) |