diff options
| author | Leo Liu <[email protected]> | 2011-03-04 00:01:24 -0800 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2011-03-04 00:01:24 -0800 |
| commit | 0a5cb52bb4ebe7dd23f3f2e8a30ca846afd353e0 (patch) | |
| tree | 050d72fe64372773f445aaaf233e0cf07170e3ed /lisp | |
| parent | d6ffd3f84f561dd8dd5f1e874a7ba1299bde8d02 (diff) | |
* lisp/vc/diff-mode.el (diff-mode): Fix whitespace-style. (Bug#8139)
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/vc/diff-mode.el | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4740444440..9b4cf73b45 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -10,6 +10,8 @@ 2011-03-04 Leo <[email protected]> + * 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 <[email protected]> (tiny change) diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 13d10f02b4..9ccb37f3a5 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 ]+\\)$") |