comparison lisp/whitespace.el @ 79296:82de3a8b0f8d

(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.

79295:7885b35965a1

		       buffer-file-name))))
  nil)

(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)

(defun whitespace-unload-hook ()
  (remove-hook 'find-file-hook 'whitespace-buffer)
  (remove-hook 'write-file-functions 'whitespace-write-file-hook t)
  (remove-hook 'kill-buffer-hook 'whitespace-buffer))

79296:82de3a8b0f8d

		       buffer-file-name))))
  nil)

(defun whitespace-unload-function ()
  "Unload the whitespace library."
  (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)
  (remove-hook 'write-file-functions 'whitespace-write-file-hook t)
  (remove-hook 'kill-buffer-hook 'whitespace-buffer))