[Emacs-diffs] /srv/bzr/emacs/trunk r105840: * lisp/whitespace.el (whitespace-newline-mode): Disable it right.

[Stefan Monnier]

------------------------------------------------------------
revno: 105840
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9550
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2011-09-19 14:06:14 -0400
message:
  * lisp/whitespace.el (whitespace-newline-mode): Disable it right.
modified:
  lisp/ChangeLog
  lisp/whitespace.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-19 06:53:45 +0000
+++ b/lisp/ChangeLog    2011-09-19 18:06:14 +0000
@@ -1,3 +1,7 @@
+2011-09-19  Stefan Monnier  <address@hidden>
+
+       * whitespace.el (whitespace-newline-mode): Disable it right (bug#9550).
+
 2011-09-19  Michael Albinus  <address@hidden>
 
        * net/tramp-sh.el (tramp-inline-compress-commands): Add "xz".

=== modified file 'lisp/whitespace.el'
--- a/lisp/whitespace.el        2011-05-04 01:02:09 +0000
+++ b/lisp/whitespace.el        2011-09-19 18:06:14 +0000
@@ -1105,8 +1105,8 @@
   :global     nil
   :group      'whitespace
   (let ((whitespace-style '(face newline-mark newline)))
-    (whitespace-mode whitespace-newline-mode)
-    ;; sync states (running a batch job)
+    (whitespace-mode (if whitespace-newline-mode 1 -1))
+    ;; Sync states (running a batch job).
     (setq whitespace-newline-mode whitespace-mode)))