2 files changed, 6 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d748c1a967c..344e4ab9dfa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * whitespace.el (whitespace-newline-mode): Disable it right (bug#9550).
+
 2011-09-19  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp-sh.el (tramp-inline-compress-commands): Add "xz".
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 89f078a5063..e0bc74343d2 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -1105,8 +1105,8 @@ See also `whitespace-newline' and `whitespace-display-mappings'."
   :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)))