* lisp/whitespace.el (whitespace-color-on): Use `prepend' OVERRIDE

value for `whitespace-line' face.

Fixes: debbugs:13875

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c2b17ff0fa618c1d9271d4019311130d9b492dd..85e89566b4dbc993da7800cddb1015be0c2f2afa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-19  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * whitespace.el (whitespace-color-on): Use `prepend' OVERRIDE
+       value for `whitespace-line' face (Bug#13875).
+
 2013-03-19  Leo Liu  <sdl.web@gmail.com>
 
        * progmodes/compile.el (compilation-display-error): New command.

diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index b0bb610aa3a51b0f3b974bde5719de5668fc0005..382d6f482e2f353f61ceba6efc4ffae475dd2083 100644 (file)
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -2209,7 +2209,7 @@ resultant list will be returned."
               ,(if (memq 'lines whitespace-active-style)
                    0                    ; whole line
                  2)                     ; line tail
-              whitespace-line t)))
+              whitespace-line prepend)))
        ,@(when (or (memq 'space-before-tab whitespace-active-style)
                    (memq 'space-before-tab::tab whitespace-active-style)
                    (memq 'space-before-tab::space whitespace-active-style))