From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 15 Apr 2016 13:56:16 +0000 (+0100)
Subject: Merge slippers:etc/profile
X-Git-Url: https://git.distorted.org.uk/~mdw/profile/commitdiff_plain/fff80d993fbf831f2cdffcbf2c0bc8f95d65b0a9

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.
---

fff80d993fbf831f2cdffcbf2c0bc8f95d65b0a9
diff --cc dot/emacs
index 562d733,d8b036c..5bb61e2
--- a/dot/emacs
+++ b/dot/emacs
@@@ -206,10 -210,9 +210,11 @@@
  	      "\\(" "\\(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)