(global-whitespace-mode): Revert last change.

(whitespace-unload-function): Force `global-whitespace-mode'
to deactivate local modes in a slightly less intrusive way.

diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 9f11172ad63b9f80b16e46cf34cc0a113c191d66..5c65e24d40577aaf071835987583762680f428fb 100644 (file)
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -928,9 +928,7 @@ Only useful with a windowing system."
       (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 @@ options are valid."
 
 (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)