X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/b76d1b814f813f9d5e692e002b1c8f644b79bc14..50a38814999fe981d4c2bd318b9375e42d599d87:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index c32d836..f71b9a2 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
@@ -158,7 +159,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)
@@ -225,6 +228,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")))