diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-03-06 16:22:16 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-03-06 16:22:16 -0500 |
| commit | 0d6459dfb52188481bfd6bb53f1b2f653ecd6a5d (patch) | |
| tree | 306b87fc2903ad23343f3c84be1cccfa72e5a97e /lisp/vc/diff-mode.el | |
| parent | 798cb64441228d473f7bdd213183c70fb582595c (diff) | |
| parent | 892777baa1739fa5f1f2d1c2975488c3e6f57bae (diff) | |
| download | emacs-0d6459dfb52188481bfd6bb53f1b2f653ecd6a5d.tar.gz | |
Merge from trunk
Diffstat (limited to 'lisp/vc/diff-mode.el')
| -rw-r--r-- | lisp/vc/diff-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 59e442a89c3..8e5fe27f965 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 ]+\\)$") |