Merge slippers:etc/profile

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 562d733..5bb61e2 100644 (file)
--- 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)
@@ -196,6 +199,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))
@@ -210,6 +214,7 @@
                    "\\(chiark\\|slimy\\|coriolis\\)\\.greenend\\.org\\.uk"
              "\\|" "distorted\\.mdw@g\\(\\|oogle\\)mail.com"
              "\\|" "mwooding@\\(good\\|blackberry\\)\\.com"
+             "\\|" "mark\\.wooding@trustonic\\.com"
              "\\)$")
       bbdb-canonicalize-net-hook
       (lambda (addr)
@@ -225,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")))