From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 11 May 2016 15:47:49 +0000 (+0100)
Subject: Merge branch 'master' of https://git.distorted.org.uk/~mdw/profile
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/8584cc9bbb827fa6e2c9b3165135c81c37ab2633?ds=inline;hp=-c

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

8584cc9bbb827fa6e2c9b3165135c81c37ab2633
diff --combined dot/emacs
index b2d9782,2f347d6..65b5e8a
--- a/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))