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.

diff --combined dot/emacs
index 2db3e6313c2c93cace5014192c3d69d6d2afd785,65b5e8a42a4e609667eacacb88fc5e0b9bda165b..0181bd00116bb6b7ae5ad3bc7f687ec4482c7ed3
--- 1/dot/emacs
--- 2/dot/emacs
+++ b/dot/emacs
@@@ -33,8 -33,8 +33,8 @@@
      (if (file-exists-p boot)
        (load boot))))
  
 -(require 'dot-emacs)
  (require 'cl)
 +(require 'dot-emacs)
  
  ;;;--------------------------------------------------------------------------
  ;;; Some random initialisation.
@@@ -346,7 -346,10 +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))