From: Leo Liu <sdl.web@gmail.com>
Date: Fri, 4 Mar 2011 08:01:24 +0000 (-0800)
Subject: * lisp/vc/diff-mode.el (diff-mode): Fix whitespace-style.  (Bug#8139)
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~674^2~46
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0a5cb52bb4ebe7dd23f3f2e8a30ca846afd353e0;p=emacs.git

* lisp/vc/diff-mode.el (diff-mode): Fix whitespace-style.  (Bug#8139)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 47404444400..9b4cf73b453 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -10,6 +10,8 @@
 
 2011-03-04  Leo  <sdl.web@gmail.com>
 
+	* vc/diff-mode.el (diff-mode): Fix whitespace-style.  (Bug#8139)
+
 	* time.el (display-time-world-list): Fix typo.  (Bug#7571)
 
 2011-03-04  Zachary Kanfer  <zkanfer@gmail.com>  (tiny change)
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 13d10f02b41..9ccb37f3a55 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -1266,7 +1266,7 @@ a diff with \\[diff-reverse-direction].
 
   ;; Set up `whitespace-mode' so that turning it on will show trailing
   ;; whitespace problems on the modified lines of the diff.
-  (set (make-local-variable 'whitespace-style) '(trailing))
+  (set (make-local-variable 'whitespace-style) '(face trailing))
   (set (make-local-variable 'whitespace-trailing-regexp)
        "^[-\+!<>].*?\\([\t ]+\\)$")