[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100370: * whitespace.el (global-whitespace-newline-mode): Fix call

[Stefan Monnier]

------------------------------------------------------------
revno: 100370
committer: Stefan Monnier <address@hidden>
branch nick: emacs-23
timestamp: Mon 2011-01-10 19:14:25 -0500
message:
  * whitespace.el (global-whitespace-newline-mode): Fix call
  to minor mode which used nil accidentally to mean "turn off".
modified:
  lisp/ChangeLog
  lisp/whitespace.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-10 20:36:09 +0000
+++ b/lisp/ChangeLog    2011-01-11 00:14:25 +0000
@@ -1,3 +1,8 @@
+2011-01-11  Stefan Monnier  <address@hidden>
+
+       * whitespace.el (global-whitespace-newline-mode): Fix call (bug#7810)
+       to minor mode which used nil accidentally to mean "turn off".
+
 2011-01-10  Michael Albinus  <address@hidden>
 
        * net/tramp.el (tramp-find-inline-compress)

=== modified file 'lisp/whitespace.el'
--- a/lisp/whitespace.el        2011-01-02 23:50:46 +0000
+++ b/lisp/whitespace.el        2011-01-11 00:14:25 +0000
@@ -1188,7 +1188,8 @@
   :global     t
   :group      'whitespace
   (let ((whitespace-style '(newline-mark newline)))
-    (global-whitespace-mode global-whitespace-newline-mode)
+    (global-whitespace-mode (if global-whitespace-newline-mode
+                                1 -1))
     ;; sync states (running a batch job)
     (setq global-whitespace-newline-mode global-whitespace-mode)))