Merge remote branches 'ponder' and 'crybaby'

[profile] / el / dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 5a152f000d4ca9c6e027f310ba052e3fe92a5daa..4969f2933afc0a766ad025a2b4471605a0c76fde 100644 (file)
--- 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"))