Merge slippers:etc/profile

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index d8b036c7a07107ca8a316a131b6875d31652a023..5bb61e2703c5696b3691640f86ea80ef86b4df51 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -203,13 +203,15 @@
       bbdb/news-auto-create-p
       (lambda ()
        (let ((group gnus-newsgroup-name))
-         (and (string-match "^nnimap\\+" group)
+         (and (string-match "^nn\\(imap\\|folder\\)\\+" group)
               (not (string-match ":\\(crap\\|spam\\|lists\\)\\." group)))))
       bbdb-user-mail-names
       (concat "^"
              "\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)"
                    "\\([-+][^@]*\\|\\)"
                    "@\\(\\(dist\\|esc\\)orted\\.org\\.uk\\|odin\\.gg\\)"
+             "\\|" "\\(mdw\\(\\+[^@]*\\)?\\|0mdwk\\.[^@]*\\)" "@"
+                   "\\(chiark\\|slimy\\|coriolis\\)\\.greenend\\.org\\.uk"
              "\\|" "distorted\\.mdw@g\\(\\|oogle\\)mail.com"
              "\\|" "mwooding@\\(good\\|blackberry\\)\\.com"
              "\\|" "mark\\.wooding@trustonic\\.com"