aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/vc/diff-mode.el
diff options
context:
space:
mode:
authorLeo Liu2011-03-04 00:01:24 -0800
committerGlenn Morris2011-03-04 00:01:24 -0800
commit0a5cb52bb4ebe7dd23f3f2e8a30ca846afd353e0 (patch)
tree050d72fe64372773f445aaaf233e0cf07170e3ed /lisp/vc/diff-mode.el
parentd6ffd3f84f561dd8dd5f1e874a7ba1299bde8d02 (diff)
downloademacs-0a5cb52bb4ebe7dd23f3f2e8a30ca846afd353e0.tar.gz
emacs-0a5cb52bb4ebe7dd23f3f2e8a30ca846afd353e0.zip
* lisp/vc/diff-mode.el (diff-mode): Fix whitespace-style. (Bug#8139)
Diffstat (limited to 'lisp/vc/diff-mode.el')
-rw-r--r--lisp/vc/diff-mode.el2
1 files changed, 1 insertions, 1 deletions
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].
1266 1266
1267 ;; Set up `whitespace-mode' so that turning it on will show trailing 1267 ;; Set up `whitespace-mode' so that turning it on will show trailing
1268 ;; whitespace problems on the modified lines of the diff. 1268 ;; whitespace problems on the modified lines of the diff.
1269 (set (make-local-variable 'whitespace-style) '(trailing)) 1269 (set (make-local-variable 'whitespace-style) '(face trailing))
1270 (set (make-local-variable 'whitespace-trailing-regexp) 1270 (set (make-local-variable 'whitespace-trailing-regexp)
1271 "^[-\+!<>].*?\\([\t ]+\\)$") 1271 "^[-\+!<>].*?\\([\t ]+\\)$")
1272 1272