X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/e7dfd5bb38d31918ee086aea4a18d3c97330ef99..fc504d2980554be25eafff1534f9e7daafafe0dd:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 34146b1..5bb61e2 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -52,6 +52,7 @@
 (maybe-autoload 'stgit "stgit" nil t)
 (maybe-autoload 'nc-timesheet-prepare "nc-timesheet" nil t nil)
 (maybe-autoload 'nc-timesheet-submit "nc-timesheet" nil t nil)
+(maybe-autoload 'org-bbdb-anniversaries "org" nil t)
 
 (and (library-exists-p "debian-changelog-mode")
      (add-to-list 'auto-mode-alist
@@ -202,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"
@@ -227,6 +230,13 @@
 					 "\\|" "distorted\\.org\\.uk"
 					 "\\)$")
 				 addr)
+		   (string-match (concat "^MicrosoftExchange[0-9a-f]*"
+					 "@newincco\\.onmicrosoft\\.com")
+				 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))
 				 "879b795aed959b1a000e9f95c132b16c")))