X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/3690368c9119a35d62afd69498fa9215d8a54560..a55efa66671e704cd3e69cb3ef5f65665d0e6caa:/dot/emacs?ds=sidebyside

diff --git a/dot/emacs b/dot/emacs
index afb08bd..562d733 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -199,13 +199,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"
 	      "\\)$")
@@ -213,17 +215,20 @@
       (lambda (addr)
 	(cond ((null addr)
 	       nil)
-	      ((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)))
-	      ((string-match (concat "^[0-9]+@bugs\\."
-				     "\\(" "debian\\.org"
-				     "\\|" "distorted\\.org\\.uk"
-				     "\\)")
-			     addr)
-	       (concat "submit@bugs." (match-string 1 addr)))
+	      ((or (string-match (concat "^reply-[0-9a-f]+-[0-9a-f]+_"
+					 "HTML-[0-9]+-[0-9]+-[0-9]+"
+					 "@\\(nationwide-communications\\."
+					 "co\\.uk\\)$")
+				 addr)
+		   (string-match (concat "^[0-9]+@bugs\\."
+					 "\\(" "debian\\.org"
+					 "\\|" "distorted\\.org\\.uk"
+					 "\\)$")
+				 addr)
+		   (and (string-match "^news\\([0-9]+\\)@\\(.*\\)$" addr)
+			(string= (md5 (match-string 2 addr))
+				 "879b795aed959b1a000e9f95c132b16c")))
+	       nil)
 	      ((string-match "^\\([^@+]+\\)\\+[^@]*\\(@.*\\)$" addr)
 	       (concat (match-string 1 addr) (match-string 2 addr)))
 	      (t addr))))