From 43026cf3f96eb213656fc373ba50080d3abe55c0 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 17 Mar 2016 10:32:11 +0000
Subject: [PATCH 1/1] dot/emacs, dot/gnus-local.el.distorted: Some BBDB
 hacking.

---
 dot/emacs                   | 21 ++++++++++++++++++++-
 dot/gnus-local.el.distorted | 12 +++++-------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/dot/emacs b/dot/emacs
index e1a5d6e..973690e 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -185,7 +185,26 @@
 
 (or mdw-fast-startup
     (trap (bbdb-initialize 'gnus 'sendmail 'message)))
-(setq bbdb-north-american-phone-numbers-p nil)
+(setq bbdb-north-american-phone-numbers-p nil
+      bbdb/news-auto-create-p (lambda ()
+				(string-match "^nnimap\\+"
+					      gnus-newsgroup-name))
+      bbdb-user-mail-names
+      (concat "^"
+	      "\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)"
+		    "\\([-+][^@]*\\|\\)"
+		    "@\\(\\(dist\\|esc\\)orted\\.org\\.uk\\|odin\\.gg\\)"
+	      "\\|" "distorted\\.mdw@g\\(\\|oogle\\)mail.com"
+	      "\\|" "mwooding@\\(good\\|blackberry\\)\\.com"
+	      "\\)$")
+      bbdb-canonicalize-net-hook
+      (lambda (addr)
+	(cond ((string-match (concat "^reply-[0-9a-f]+-[0-9a-f]+_"
+				     "HTML-[0-9]+-[0-9]+-[0-9]+"
+				     "@\\(nationwide-communications\\.co\\.uk\\)")
+			     addr)
+	       (concat "nationwide@" (match-string 1 addr)))
+	      (t addr))))
 
 ;; Customization.
 
diff --git a/dot/gnus-local.el.distorted b/dot/gnus-local.el.distorted
index 02dea2e..b4b0037 100644
--- a/dot/gnus-local.el.distorted
+++ b/dot/gnus-local.el.distorted
@@ -26,6 +26,10 @@
 		(nnimap-address "mail.distorted.org.uk")
 		(nnimap-stream tls)
 		(nnimap-authinfo-file "~/.gnus.authinfo"))
+	(nnimap "markw-distorted"
+		(nnimap-address "mail.distorted.org.uk")
+		(nnimap-stream tls)
+		(nnimap-authinfo-file "~/.gnus.authinfo.markw"))
 	(nnimap "google"
 		(nnimap-address "imap.gmail.com")
 		(nnimap-stream tls)
@@ -54,13 +58,7 @@
       "^nnimap\\+distorted:\\(crap\\|spam\\|admin\\|lists\\|nag\\)\\..*")
 
 ;; My various email addresses.
-(setq message-alternative-emails
-      (concat "^"
-	      "\\(" "\\(mdw\\|markw\\|postmaster\\)"
-		    "\\([-+][^@]*\\|\\)"
-		    "@\\(distorted\\.org\\.uk\\|escorted\\.org\\.uk\\|odin\\.gg\\)"
-	      "\\|" "distorted\\.mdw@g\\(oogle\\|\\)mail\\.com"
-	      "\\)$")
+(setq message-alternative-emails bbdb-user-mail-names
       message-dont-reply-to-names message-alternative-emails)
 
 ;; Mail sent to `mdw-nospam-THING' should appear to come from this address.
-- 
2.11.0