Merge branch 'master' of https://git.distorted.org.uk/~mdw/profile

* 'master' of https://git.distorted.org.uk/~mdw/profile:
  dot/gnus.el, dot/gnus-local.el.distorted: Fancy mail sending.
  dot/emacs: I have another chiark email address now.
  dot/gnus-local.el.distorted (gnus-posting-styles): Set address better.

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

diff --combined dot/emacs
index b2d978223985c133d87712301b46a8781fbe2de5,2f347d6648f503dbe878d5cd8ab21057b302b2b5..65b5e8a42a4e609667eacacb88fc5e0b9bda165b
--- 1/dot/emacs
--- 2/dot/emacs
+++ b/dot/emacs
@@@ -212,7 -212,10 +212,10 @@@
              "\\(" "\\(mdw\\|markw\\|root\\|postmaster\\)"
                    "\\([-+][^@]*\\|\\)"
                    "@\\(\\(dist\\|esc\\)orted\\.org\\.uk\\|odin\\.gg\\)"
-             "\\|" "\\(mdw\\(\\+[^@]*\\)?\\|0mdwk\\.[^@]*\\)" "@"
+             "\\|" "\\(" "\\(mdw\\|mwooding\\)"
+                         "\\(\\+[^@]*\\)?"
+                   "\\|" "0" "\\(mdw\\|mwooding\\)" "k\\.[^@]*"
+                   "\\)" "@"
                    "\\(chiark\\|slimy\\|coriolis\\)\\.greenend\\.org\\.uk"
              "\\|" "distorted\\.mdw@g\\(\\|oogle\\)mail.com"
              "\\|" "mwooding@\\(good\\|blackberry\\)\\.com"
@@@ -343,10 -346,7 +346,10 @@@
    (setq uniquify-buffer-name-style 'post-forward-angle-brackets)
    (setq uniquify-after-kill-buffer-p t))
  (transient-mark-mode t)
 -(setq mark-even-if-inactive t)
 +(setq mark-even-if-inactive t
 +      shift-select-mode nil
 +      delete-active-region nil
 +      delete-selection-mode nil)
  (trap
    (tooltip-mode 0)
    (tool-bar-mode 0))