Merge remote-tracking branch 'staging'
authorMark Wooding <mdw@distorted.org.uk>
Wed, 11 May 2016 19:25:02 +0000 (20:25 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Wed, 11 May 2016 19:25:02 +0000 (20:25 +0100)
commit3bf4f66219dcf1b1c231dfafd88cf2f28322c56e
treef226436f27b92fba6f6d05a7eb5d0aebcc6e676d
parente613fc7d1f1bbb8c3c9954646d8c85a26b241603
parent8584cc9bbb827fa6e2c9b3165135c81c37ab2633
Merge remote-tracking branch 'staging'

* staging:
  dot/xinitrc: Correct geometry if the Lucid build of Emacs 24 is found.
  dot/emacs: Configure transient-mark-mode sensibly for later Emacsen.
dot/emacs