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

* 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/etc/profile:
  dot/emacs: Use `window-system-default-frame-alist'.
  dot/Xdefaults: Use server fonts by default in Emacs.
  dot/emacs: Turn on column number display.
  dot/emacs: More `dired' hacking: tweak keymap.
  dot/emacs: Tweak `dired' settings.
  dot/emacs: Force use of server-side X fonts.
  dot/emacs: Make `gnus' be the default mail reader.
  dot/emacs: Fix stupid bug in `tramp' setup.
  el/dot-emacs.el: Complicated `exchange-point-and-mark' hack.
  dot/emacs: Insinuate `org' with `remember'.
  dot/emacs: Format line numbers prettily.
  dot/emacs: Turn password expiry off.
  dot/emacs: Tweak file-local variable settings.
  el/dot-emacs.el: Use `make-local-variable'.
  bin/mdw-build: Cross-check Git and Debian version numbers.
  dot/emacs, el/dot-emacs.el: Fix `tramp-methods' some more.
  dot/emacs, el/dot-emacs.el: Fix patterns for root prompt.
  emacs: Yet another spelling of `git' in `vc-handled-backends'.
  el/dot-emacs.el: Clobber `comint-highlight-input' properly.

diff --cc el/dot-emacs.el
Simple merge