dot/emacs: Kick BBDB to always include a name when completing addresses.

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index f71b9a2..bd00d20 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -199,17 +199,20 @@
     (trap (bbdb-initialize 'gnus 'sendmail 'message)))
 (setq bbdb-file "~/etc/brain/bbdb"
       bbdb-north-american-phone-numbers-p nil
+      bbdb-dwim-net-address-allow-redundancy t
       bbdb-extract-address-components-func 'bbdb-extract-address-components
       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"
@@ -233,6 +236,7 @@
                                 addr)
                   (member (md5 addr)
                           '("8815c5583970856799c85a3ee0eb6a9f" ;work wiki spam
+                            "0b94ab4d25dacaa5ac07243a09c9e22e" ;work bug spam
                             ))
                   (and (string-match "^news\\([0-9]+\\)@\\(.*\\)$" addr)
                        (string= (md5 (match-string 2 addr))