diff options
author | 2012-10-07 15:23:23 +0200 | |
---|---|---|
committer | 2012-10-07 15:23:23 +0200 | |
commit | 52abe4f88168002420813e20751d772023d96718 (patch) | |
tree | d87aeefe7ca798fd8cdb911d932a2712944f5ca3 /.emacs.d/gnus.el | |
parent | 5b8d412cf79168fc6cdd45eac3ce65934d1f7b8d (diff) | |
parent | 049a44b608aacbaf1f040183def77fd7e7243fe3 (diff) | |
download | dotfiles-52abe4f88168002420813e20751d772023d96718.tar.gz dotfiles-52abe4f88168002420813e20751d772023d96718.zip |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.config/awesome/rc.lua
Diffstat (limited to '.emacs.d/gnus.el')
-rw-r--r-- | .emacs.d/gnus.el | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/.emacs.d/gnus.el b/.emacs.d/gnus.el index 1bf988a..503aa1d 100644 --- a/.emacs.d/gnus.el +++ b/.emacs.d/gnus.el @@ -1,4 +1,3 @@ -;; -*- eval: (git-auto-commit-mode 1) -*- (setq gnus-select-method '(nntp "news.eternal-september.org")) (setq gnus-secondary-select-methods '((nnmaildir "gmail" @@ -64,7 +63,7 @@ (add-hook 'gnus-group-mode-hook '(lambda () (linum-mode -1))) ;-----[ BBDB ]-------------------------------------------------------- -(require 'bbdb) -(bbdb-initialize 'gnus 'message) -(bbdb-insinuate-gnus) -(setq bbdb-north-american-phone-numbers-p nil) +;; (require 'bbdb) +;; (bbdb-initialize 'gnus 'message) +;; (bbdb-insinuate-gnus) +;; (setq bbdb-north-american-phone-numbers-p nil) |