X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/0612a9149d46df422e11410d8ada66b78d3fe5d3..9bd87c69ae091777909a0962782aa47b5ebc82c4:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index b03ff68..9e4ceff 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -158,7 +158,9 @@
 (setq mail-from-style 'angles
       mail-signature t
       mail-yank-prefix "> "
-      mail-archive-file-name "~/Mail/sent"
+      mail-archive-file-name nil
+      message-default-mail-headers ""
+      message-default-news-headers ""
       compose-mail-user-agent-warnings nil)
 
 (setq rmail-display-summary t)
@@ -196,6 +198,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 +211,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)
@@ -223,6 +227,12 @@
 					 "\\|" "distorted\\.org\\.uk"
 					 "\\)$")
 				 addr)
+		   (string-match (concat "^MicrosoftExchange[0-9a-f]*"
+					 "@newincco\\.onmicrosoft\\.com")
+				 addr)
+		   (member (md5 addr)
+			   '("8815c5583970856799c85a3ee0eb6a9f" ;work wiki spam
+			     ))
 		   (and (string-match "^news\\([0-9]+\\)@\\(.*\\)$" addr)
 			(string= (md5 (match-string 2 addr))
 				 "879b795aed959b1a000e9f95c132b16c")))