[Emacs-diffs] Changes to emacs/lisp/whitespace.el,v

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      08/02/02 17:41:55

Index: whitespace.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/whitespace.el,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- whitespace.el       2 Feb 2008 04:17:54 -0000       1.69
+++ whitespace.el       2 Feb 2008 17:41:55 -0000       1.70
@@ -928,9 +928,7 @@
       (remove-hook 'find-file-hook 'whitespace-turn-on-if-enabled)
       (dolist (buffer (buffer-list))   ; adjust all local mode
        (set-buffer buffer)
-       (when (or (not whitespace-mode)
-                 ;; whitespace is being unloaded
-                 (bound-and-true-p unload-function-defs-list))
+       (unless whitespace-mode
          (whitespace-turn-off)))))))
 
 
@@ -1758,7 +1756,8 @@
 
 (defun whitespace-unload-function ()
   "Unload the Whitespace library."
-  (global-whitespace-mode -1)
+  (let (whitespace-mode) ;; so g-w-m thinks it is nil in all buffers
+    (global-whitespace-mode -1))
   ;; continue standard unloading
   nil)