aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2013-03-19 08:23:36 +0400
committerDmitry Gutov2013-03-19 08:23:36 +0400
commit627b52b0c6f73edc94db90b1f76bd9f44a626ffd (patch)
treeb0f1e7172e02f521d0b6a1a74b41f79ac299a74d
parent50c3a20bac9ebccc003fb899f575e73d0e04216a (diff)
downloademacs-627b52b0c6f73edc94db90b1f76bd9f44a626ffd.tar.gz
emacs-627b52b0c6f73edc94db90b1f76bd9f44a626ffd.zip
* lisp/whitespace.el (whitespace-color-on): Use `prepend' OVERRIDE
value for `whitespace-line' face. Fixes: debbugs:13875
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/whitespace.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c2b17ff0fa..85e89566b4d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-03-19 Dmitry Gutov <dgutov@yandex.ru>
2
3 * whitespace.el (whitespace-color-on): Use `prepend' OVERRIDE
4 value for `whitespace-line' face (Bug#13875).
5
12013-03-19 Leo Liu <sdl.web@gmail.com> 62013-03-19 Leo Liu <sdl.web@gmail.com>
2 7
3 * progmodes/compile.el (compilation-display-error): New command. 8 * progmodes/compile.el (compilation-display-error): New command.
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index b0bb610aa3a..382d6f482e2 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -2209,7 +2209,7 @@ resultant list will be returned."
2209 ,(if (memq 'lines whitespace-active-style) 2209 ,(if (memq 'lines whitespace-active-style)
2210 0 ; whole line 2210 0 ; whole line
2211 2) ; line tail 2211 2) ; line tail
2212 whitespace-line t))) 2212 whitespace-line prepend)))
2213 ,@(when (or (memq 'space-before-tab whitespace-active-style) 2213 ,@(when (or (memq 'space-before-tab whitespace-active-style)
2214 (memq 'space-before-tab::tab whitespace-active-style) 2214 (memq 'space-before-tab::tab whitespace-active-style)
2215 (memq 'space-before-tab::space whitespace-active-style)) 2215 (memq 'space-before-tab::space whitespace-active-style))