(whitespace-unload-function): New-style unload function.

When run, unintern `whitespace-unload-hook' and call
`unload-feature' recursively to stop the old hook from
messing with the unloading.

1 files changed, 12 insertions, 9 deletions

diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 0251618f099..9c3a6cc18d8 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -793,15 +793,18 @@ This is meant to be added buffer-locally to `write-file-functions'."
 
 (defun whitespace-unload-function ()
   "Unload the whitespace library."
-  (whitespace-global-mode -1)
-  (save-current-buffer
-    (dolist (buf (buffer-list))
-      (set-buffer buf)
-      (remove-hook 'write-file-functions 'whitespace-write-file-hook t)))
-  ;; new-style unloading, stop old style from running
-  (with-no-warnings (setq whitespace-unload-hook nil))
-  ;; continue standard unloading
-  nil)
+  (if (unintern "whitespace-unload-hook")
+      ;; if whitespace-unload-hook is defined, let's get rid of it
+      ;; and recursively call `unload-feature'
+      (progn (unload-feature 'whitespace) t)
+    ;; this only happens in the recursive call
+    (whitespace-global-mode -1)
+    (save-current-buffer
+      (dolist (buf (buffer-list))
+	(set-buffer buf)
+	(remove-hook 'write-file-functions 'whitespace-write-file-hook t)))
+    ;; continue standard unloading
+    nil))
 
 (defun whitespace-unload-hook ()
   (remove-hook 'find-file-hook 'whitespace-buffer)