Merge slippers:etc/profile
authorMark Wooding <mdw@distorted.org.uk>
Fri, 15 Apr 2016 13:56:16 +0000 (14:56 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 15 Apr 2016 13:56:16 +0000 (14:56 +0100)
* 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.

1  2 
dot/emacs

diff --cc dot/emacs
+++ b/dot/emacs
              "\\(" "\\(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)