Merge branch 'master' of https://git.distorted.org.uk/~mdw/profile

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index b03ff68..c32d836 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -196,6 +196,7 @@
     (trap (bbdb-initialize 'gnus 'sendmail 'message)))
 (setq bbdb-file "~/etc/brain/bbdb"
       bbdb-north-american-phone-numbers-p nil
+      bbdb-extract-address-components-func 'bbdb-extract-address-components
       bbdb/news-auto-create-p
       (lambda ()
        (let ((group gnus-newsgroup-name))
@@ -208,6 +209,7 @@
                    "@\\(\\(dist\\|esc\\)orted\\.org\\.uk\\|odin\\.gg\\)"
              "\\|" "distorted\\.mdw@g\\(\\|oogle\\)mail.com"
              "\\|" "mwooding@\\(good\\|blackberry\\)\\.com"
+             "\\|" "mark\\.wooding@trustonic\\.com"
              "\\)$")
       bbdb-canonicalize-net-hook
       (lambda (addr)