Merge branch 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/etc/profile

* 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/etc/profile:
  el/dot-emacs.el: `mdw-whitespace-mode' changes trailing visibility.
  dot/xinitrc: Start gnome-session(1).
  Merge remote branches 'crybaby' and 'ponder'
  dot/xinitrc: Wait for e16 to start, and tweak cursor after it does.
  dot/e16-bindings: New bindings for moving and resizing windows.
  dot/e16-bindings: Use xinitcmd(1) rather than xatom(1).
  dot/xinitrc: Provide mnemonics for xgetline(1) prompts.
  dot/bash_profile (__mdw_addto): Quote new value properly.
  dot/emacs: Support the Chrome edit server.
  dot/vimrc: Use the right font and colours.  Turn on autoindent.
  dot/xinitrc: Whoops.  Spelt the Gnome authentication agent thing wrong.
  el/dot-emacs.el: Twiddle `variable-pitch' face size for Emacs 22.

diff --combined dot/e16-bindings
index 74998707b45cd91cc84015b0f220c9061f5d73d5,cd3a00309492df8a81532fdf0f590335b4b6eb96..978182676f27bb7363dca0c3f11de3d03cd8e749
--- 1/dot/e16-bindings
--- 2/dot/e16-bindings
+++ b/dot/e16-bindings
@@@ -31,9 -31,9 +31,9 @@@ Tooltip Go Forward a Deskto
  Aclass KEYBINDINGS global
  KeyDown    5       F6 exec gconftool --toggle /desktop/gnome/accessibility/keyboard/mousekeys_enable
  KeyDown    5       F7 exec un-backslashify-selection
- KeyDown    5       F8 exec xatom set XINIT_COMMAND :terminal
- KeyDown    5       F9 exec xatom set XINIT_COMMAND :ask-run
- KeyDown          5      F10 exec xatom set XINIT_COMMAND :ask-command
+ KeyDown    5       F8 exec xinitcmd :terminal
+ KeyDown    5       F9 exec xinitcmd :ask-run
+ KeyDown          5      F10 exec xinitcmd :ask-command
  KeyDown          5      F11 exec lock-screen
  KeyDown    5      F12 exec xshutdown
  KeyDown    5      Tab focus next
@@@ -51,7 -51,6 +51,7 @@@ KeyDown   C5        s wop * stic
  KeyDown   C5        v wop * th available
  KeyDown   C5        w menus show winops.menu
  KeyDown   C5        x wop * close
 +KeyDown   C5        z wop * zoom
  KeyDown   C5       F1 menus show file.menu
  KeyDown   C5       F2 menus show enlightenment.menu
  KeyDown   C5       F3 menus show settings.menu
@@@ -66,3 -65,11 +66,11 @@@ KeyDown   S5       Up area move 0 -
  KeyDown   S5     Down area move 0 1
  KeyDown   S5     Left area move -1 0
  KeyDown   S5    Right area move 1 0
+ KeyDown         5        Up wop * mr 0 -15
+ KeyDown         5      Down wop * mr 0 +15
+ KeyDown         5      Left wop * mr -15 0
+ KeyDown         5     Right wop * mr +15 0
+ KeyDown         SC5      Up wop * sr 0 -15
+ KeyDown         SC5    Down wop * sr 0 +15
+ KeyDown         SC5    Left wop * sr -15 0
+ KeyDown         SC5   Right wop * sr +15 0

diff --combined dot/emacs
index ab9a94fa3b3a6d3d0bd6b8e71fe1af5b50d9c595,ed2d4d1cd7034aba1bd8161f2d03fe255a7d9d86..f65a0329df709f57a1870dfa45616c8e65a0765f
--- 1/dot/emacs
--- 2/dot/emacs
+++ b/dot/emacs
@@@ -94,8 -94,12 +94,12 @@@
  
  (and (or window-system (>= emacs-major-version 23))
       (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
+                 edit-server-new-frame nil
                  gnuserv-frame t)
-           (trap (server-start))))
+           (trap (server-start))
+           (trap (progn
+                   (require 'edit-server)
+                   (edit-server-start)))))
  
  ;; Control backup behaviour.
  
@@@ -268,7 -272,6 +272,7 @@@
  (setq url-cookie-untrusted-urls '("."))
  
  (setq browse-url-browser-function (mdw-good-url-browser)
 +      browse-url-generic-program "mdw-chrome"
        browse-url-mozilla-program "firefox")
  
  (setq w3m-default-display-inline-images t)

diff --combined el/dot-emacs.el
index 547c4e9d60224ed71c9f45a6a9387c5976a21eb6,c344a3101a232c210e0f7f33661dfd832ca3ca69..dc4b041c73de5762c30fdcf8db974139f8c5324b
--- 1/el/dot-emacs.el
--- 2/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@@ -516,8 -516,7 +516,8 @@@ If NEW-SESSION-P, start a new session.
        (select-window window)))))
  
  (defvar mdw-good-url-browsers
 -  '((w3m . mdw-w3m-browse-url)
 +  '(browse-url-generic
 +    (w3m . mdw-w3m-browse-url)
      browse-url-w3
      browse-url-mozilla)
    "List of good browsers for mdw-good-url-browsers.
@@@ -706,7 -705,8 +706,8 @@@ case.
    (when (and (boundp 'whitespace-style)
             (fboundp 'whitespace-mode))
      (let ((whitespace-style (remove 'trailing whitespace-style)))
-       (whitespace-mode arg))))
+       (whitespace-mode arg))
+     (setq show-trailing-whitespace whitespace-mode)))
  
  (defun mdw-misc-mode-config ()
    (and mdw-auto-indent
@@@ -807,7 -807,7 +808,7 @@@ doesn't match any of the regular expres
      (mdw-define-face variable-pitch
        (((type x)) :family "sans" :height 100))
    (mdw-define-face variable-pitch
-     (((type x)) :family "helvetica" :height 120)))
+     (((type x)) :family "helvetica" :height 90)))
  (mdw-define-face region
    (((type tty) (class color)) :background "blue")
    (((type tty) (class mono)) :inverse-video t)
@@@ -2180,6 -2180,7 +2181,6 @@@ strip numbers instead.
    (modify-syntax-entry ?\n ">" messages-mode-syntax-table)
    (setq comment-start "# ")
    (setq comment-end "")
 -  (turn-on-font-lock-if-enabled)
    (run-hooks 'messages-mode-hook))
  
  (defun cpp-messages-mode ()
@@@ -2206,6 -2207,7 +2207,6 @@@
                                      "\\)\\>\\|[0-9]+\\|$\\)\\)")
                              '(1 font-lock-keyword-face)))
                  messages-mode-keywords)))
 -  (turn-on-font-lock-if-enabled)
    (run-hooks 'cpp-messages-mode-hook))
  
  (add-hook 'messages-mode-hook 'mdw-misc-mode-config t)
@@@ -2256,6 -2258,7 +2257,6 @@@
    (modify-syntax-entry ?\n ">" mallow-driver-mode-syntax-table)
    (setq comment-start "%# ")
    (setq comment-end "")
 -  (turn-on-font-lock-if-enabled)
    (run-hooks 'mallow-driver-mode-hook))
  
  (add-hook 'mallow-driver-hook 'mdw-misc-mode-config t)
@@@ -2298,6 -2301,7 +2299,6 @@@
         '("\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)" (0 mdw-punct-face))))
    (setq font-lock-defaults
        '(nfast-debug-mode-keywords nil nil nil nil))
 -  (turn-on-font-lock-if-enabled)
    (run-hooks 'nfast-debug-mode-hook))
  
  ;;;--------------------------------------------------------------------------