Merge branch 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile

* 'master' of git+ssh://ponder.ncipher.com/~mwooding/etc/profile:
  emacs: New keybindings for windmove.
  emacs: Use vector notation consistently for key bindings.

diff --combined emacs
index c7c884402b5582870cee1c189cf657c1b22de41c,bae4138ee6b5cb63d28e357f11de988e4723b849..f47f77bdba7b6bf060a566f6ea439f53f244aee0
--- 1/emacs
--- 2/emacs
+++ b/emacs
@@@ -1,5 -1,7 +1,5 @@@
  ;;; -*- mode: emacs-lisp; coding: utf-8 -*-
  ;;;
 -;;; $Id: .emacs,v 1.11 1997/01/01 18:47:09 mdw Exp $
 -;;;
  ;;; Emacs configuration file
  ;;;
  ;;; (c) 1996-1999 Mark Wooding
@@@ -78,15 -80,6 +78,15 @@@
  (setq backup-by-copying-when-linked t)
  (setq backup-by-copying-when-mismatch t)
  
 +(setq mdw-backup-disable-regexps
 +      '("/\\.git/COMMIT_EDITMSG$"
 +      "/\\.stgit\\(-edit\\.txt\\|msg\\.txt\\|\\.msg\\)$"))
 +
 +;; --- Safe variables ---
 +
 +(setq safe-local-variable-values
 +      '((make-backup-files . nil)))
 +
  ;; --- Calculator fiddling ---
  
  (setq calc-settings-file "~/.emacs-calc")
@@@ -140,8 -133,6 +140,8 @@@
  (setq dabbrev-case-replace nil)               ;Retain case when completing
  (setq next-line-add-newlines nil)     ;Don't add weird newlines
  (setq split-height-threshold 45)      ;Reuse windows where sensible
 +(setq display-buffer-reuse-frames nil ;Don't confuse me by showing buffers
 +      iswitchb-default-method 'samewindow) ;in other random frames
  (setq dired-deletion-confirmer                ;Make deletion easier in dired
        (symbol-function 'y-or-n-p))
  (setq dired-listing-switches "-alF")  ;Do `ls -F' things in dired windows
@@@ -175,8 -166,6 +175,8 @@@
  (trap (or mdw-fast-startup (global-auto-revert-mode t)))
  (setq psgml-html-build-new-buffer nil)
  
 +(defvar mdw-black-background t)
 +
  (setq cltl2-root-url (mdw-config 'cltl-url))
  (setq common-lisp-hyperspec-root (mdw-config 'hyperspec-url))
  
@@@ -202,22 -191,12 +202,22 @@@
  
  ;;;----- Calendar configuration ---------------------------------------------
  
 +(setq diary-file "~/etc/diary")
 +
  ;; --- Trivial stuff for the sunrise/sunset calculations ---
  
  (setq calendar-latitude 52.2)
  (setq calendar-longitude 0.1)
  (setq calendar-location-name "Cambridge, UK")
  
 +;; --- Holidays ---
 +
 +(and (not mdw-fast-startup)
 +     (trap
 +       (require 'ew-hols)
 +       (setq other-holidays (append english-and-welsh-bank-holidays
 +                                  other-holidays))))
 +
  ;; --- Date format fiddling ---
  
  (setq european-calendar-style t)
@@@ -254,7 -233,7 +254,7 @@@
        (let ((view-diary-entries-initially t))
        (calendar))))
  
 -(defvar mdw-black-background t)
 +;;;----- MailCrypt ----------------------------------------------------------
  
  ;; --- Define more mode hooks for MailCrypt ---
  
@@@ -319,9 -298,17 +319,17 @@@
  
  (trap
    (windmove-default-keybindings)
+   (global-set-key [?\C-x ?w left] 'windmove-left)
+   (global-set-key [?\C-x ?w ?h] 'windmove-left)
+   (global-set-key [?\C-x ?w up] 'windmove-up)
+   (global-set-key [?\C-x ?w ?k] 'windmove-up)
+   (global-set-key [?\C-x ?w down] 'windmove-down)
+   (global-set-key [?\C-x ?w ?j] 'windmove-down)
+   (global-set-key [?\C-x ?w right] 'windmove-right)
+   (global-set-key [?\C-x ?w ?l] 'windmove-right)
    (setq windmove-wrap-around t))
  (trap (iswitchb-mode))
- (global-set-key "\M-#" 'calc-dispatch)
+ (global-set-key [?\M-#] 'calc-dispatch)
  (global-set-key [f4] 'query-replace-regexp)
  (global-set-key [f5] 'goto-line)
  (global-set-key [f6] 'auto-fill-mode)
@@@ -329,14 -316,14 +337,14 @@@
  (global-set-key [f8] 'undo)
  (global-set-key [f9] 'mdw-divvy-window)
  (global-set-key [insertchar] 'overwrite-mode)
- (global-set-key "\C-xm" 'vm-mail)
- (global-set-key "\C-x\C-n" 'skel-create-file)
- (global-set-key "\C-x4n" 'skel-create-file-other-window)
- (global-set-key "\C-x5n" 'skel-create-file-other-frame)
+ (global-set-key [?\C-x ?m] 'vm-mail)
+ (global-set-key [?\C-x ?\C-n] 'skel-create-file)
+ (global-set-key [?\C-x ?4 ?n] 'skel-create-file-other-window)
+ (global-set-key [?\C-x ?5 ?n] 'skel-create-file-other-frame)
  (global-set-key [delete] 'delete-char)
- (global-set-key "\C-[\C-m" 'call-last-kbd-macro)
- (global-set-key "\M-q" 'mdw-fill-paragraph)
- (global-set-key "\C-h\C-m" 'manual-entry)
+ (global-set-key [?\C-[ ?\C-m] 'call-last-kbd-macro)
+ (global-set-key [?\M-q] 'mdw-fill-paragraph)
+ (global-set-key [?\C-h ?\C-m] 'manual-entry)
  (global-set-key [mode-line C-mouse-1] 'mouse-tear-off-window)
  (global-set-key [vertical-scroll-bar C-down-mouse-1]
                'mouse-drag-vertical-line)