Merge slippers:etc/profile

* slippers:etc/profile:
  dot/bash_profile: Sensible default behaviour for `~/.mdw.conf' lookups.
  dot/emacs: Ignore email addresses for work bug system.
  dot/gnus.el: Set a null primary source if no NNTP server is available.
  dot/emacs: Arrange for Org mode to autoload for diary's benefit.
  dot/bash_profile: Use the `gnome-keyring-daemon' if there's a session bus.
  dot/emacs: Some more addresses for BBDB to ignore.
  dot/emacs: Don't try to save mail to `~/Mail/sent'.
  el/dot-emacs.el: Fix `bbdb-canonicalize-address'.
  dot/emacs: Note a new email address for me.
  dot/emacs: Use working `bbdb-extract-address-components-func'.
  dot/fonts.conf: Fix mis-spelled attribute name.

diff --combined dot/emacs
index 562d733,d8b036c..5bb61e2
--- 1/dot/emacs
--- 2/dot/emacs
+++ b/dot/emacs
@@@ -52,6 -52,7 +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 +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,20 -199,20 +199,22 @@@
      (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))
 -        (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"
              "\\)$")
        bbdb-canonicalize-net-hook
        (lambda (addr)
@@@ -225,6 -228,13 +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")))