[Emacs-diffs] /srv/bzr/emacs/trunk r106251: Disable whitespace-newline-mode properly.

[Vinicius Jose Latorre]

------------------------------------------------------------
revno: 106251
committer: Vinicius Jose Latorre  <address@hidden
branch nick: trunk
timestamp: Sun 2011-10-30 22:37:09 -0200
message:
  Disable whitespace-newline-mode properly.
modified:
  etc/images/icons/allout-widgets/light-bg/locked-encrypted.png*
  etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png*
  lisp/ChangeLog
  lisp/whitespace.el

=== modified file 
'etc/images/icons/allout-widgets/light-bg/locked-encrypted.png' (properties 
changed: -x to +x)
=== modified file 
'etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png' (properties 
changed: -x to +x)
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-10-30 15:21:37 +0000
+++ b/lisp/ChangeLog    2011-10-31 00:37:09 +0000
@@ -1,3 +1,9 @@
+2011-10-30  Vinicius Jose Latorre  <address@hidden>
+
+       * whitespace.el: New version 13.2.2.
+       (whitespace-newline-mode): Disable properly.  Reported by Sarah
+       <EmacsWiki>.
+
 2011-10-30  Ulf Jasper  <address@hidden>
 
        * net/newst-treeview.el: Remove "Time-stamp".

=== modified file 'lisp/whitespace.el'
--- a/lisp/whitespace.el        2011-10-19 12:54:24 +0000
+++ b/lisp/whitespace.el        2011-10-31 00:37:09 +0000
@@ -5,7 +5,7 @@
 ;; Author: Vinicius Jose Latorre <address@hidden>
 ;; Maintainer: Vinicius Jose Latorre <address@hidden>
 ;; Keywords: data, wp
-;; Version: 13.2.1
+;; Version: 13.2.2
 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 
 ;; This file is part of GNU Emacs.
@@ -1102,10 +1102,14 @@
   :init-value nil
   :global     nil
   :group      'whitespace
-  (let ((whitespace-style '(face newline-mark newline)))
-    (whitespace-mode (if whitespace-newline-mode 1 -1))
-    ;; Sync states (running a batch job).
-    (setq whitespace-newline-mode whitespace-mode)))
+  (cond
+   (whitespace-newline-mode
+    (let ((whitespace-style '(face newline-mark newline)))
+      (whitespace-mode whitespace-newline-mode)))
+   (t
+    (whitespace-mode -1)))
+  ;; sync states (running a batch job)
+  (setq whitespace-newline-mode whitespace-mode))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;