comparison lisp/whitespace.el @ 91471:13eacee3408e

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

91470:9a247ca132c4

   (t					; global-whitespace-mode off
    (save-excursion
      (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))
	  (whitespace-turn-off)))))))


(defun whitespace-turn-on-if-enabled ()
  (when (cond

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;


(defun whitespace-unload-function ()
  "Unload the Whitespace library."
  (global-whitespace-mode -1)
  ;; continue standard unloading
  nil)

(provide 'whitespace)

91471:13eacee3408e

   (t					; global-whitespace-mode off
    (save-excursion
      (remove-hook 'find-file-hook 'whitespace-turn-on-if-enabled)
      (dolist (buffer (buffer-list))	; adjust all local mode
	(set-buffer buffer)
	(unless whitespace-mode
	  (whitespace-turn-off)))))))


(defun whitespace-turn-on-if-enabled ()
  (when (cond

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;


(defun whitespace-unload-function ()
  "Unload the Whitespace library."
  (let (whitespace-mode) ;; so g-w-m thinks it is nil in all buffers
    (global-whitespace-mode -1))
  ;; continue standard unloading
  nil)

(provide 'whitespace)