From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 20 Dec 2009 22:58:29 +0000 (+0000)
Subject: Merge remote branches 'ponder' and 'crybaby'
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/4983780af98c0465162b06554cd55ffcd213cfcd

Merge remote branches 'ponder' and 'crybaby'

* ponder:
  el/dot-emacs.el: Aliases for `eshell'.
  el/dot-emacs.el: Remove menu bar from dumb terminals.
  el/dot-emacs.el: Remove stray debugging code.
  el/dot-emacs.el: Emacs 22 doesn't have `whitespace-mode'.
  dot/bash_profile: Use Perforce configuration files.

* crybaby:
  emacs: Yet another spelling of `git' in `vc-handled-backends'.
  el/dot-emacs.el: Clobber `comint-highlight-input' properly.
---

4983780af98c0465162b06554cd55ffcd213cfcd