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: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/4983780af98c0465162b06554cd55ffcd213cfcd?hp=415a23dd3faaee25d7f28be55208eea0cbb78e21

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.
---

diff --git a/dot/emacs b/dot/emacs
index fe58c97..2a7796a 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -55,6 +55,7 @@
 (and (library-exists-p "vc-git")
      (not (memq 'GIT vc-handled-backends))
      (not (memq 'Git vc-handled-backends))
+     (not (memq 'git vc-handled-backends))
      (setq vc-handled-backends (cons 'GIT vc-handled-backends)))
 
 (trap (or mdw-fast-startup (require 'p4)))
diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 5a152f0..4969f29 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -815,7 +815,8 @@ (mdw-define-face calendar-today-face
 
 (mdw-define-face comint-highlight-prompt
   (t :weight bold))
-(mdw-define-face comint-highlight-input)
+(mdw-define-face comint-highlight-input
+  (t nil))
 
 (mdw-define-face trailing-whitespace
   (((class color)) :background "red")
@@ -889,7 +890,8 @@ (mdw-define-face diff-added
   (t :foreground "green"))
 (mdw-define-face diff-removed
   (t :foreground "red"))
-(mdw-define-face diff-context)
+(mdw-define-face diff-context
+  (t nil))
 
 (mdw-define-face erc-input-face
   (t :foreground "red"))