Mercurial > emacs
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.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sat, 02 Feb 2008 17:41:55 +0000 |
parents | 649ddfa757be |
children | 0418e6ff8eb2 |
comparison
equal
deleted
inserted
replaced
91470:9a247ca132c4 | 91471:13eacee3408e |
---|---|
926 (t ; global-whitespace-mode off | 926 (t ; global-whitespace-mode off |
927 (save-excursion | 927 (save-excursion |
928 (remove-hook 'find-file-hook 'whitespace-turn-on-if-enabled) | 928 (remove-hook 'find-file-hook 'whitespace-turn-on-if-enabled) |
929 (dolist (buffer (buffer-list)) ; adjust all local mode | 929 (dolist (buffer (buffer-list)) ; adjust all local mode |
930 (set-buffer buffer) | 930 (set-buffer buffer) |
931 (when (or (not whitespace-mode) | 931 (unless whitespace-mode |
932 ;; whitespace is being unloaded | |
933 (bound-and-true-p unload-function-defs-list)) | |
934 (whitespace-turn-off))))))) | 932 (whitespace-turn-off))))))) |
935 | 933 |
936 | 934 |
937 (defun whitespace-turn-on-if-enabled () | 935 (defun whitespace-turn-on-if-enabled () |
938 (when (cond | 936 (when (cond |
1756 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 1754 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
1757 | 1755 |
1758 | 1756 |
1759 (defun whitespace-unload-function () | 1757 (defun whitespace-unload-function () |
1760 "Unload the Whitespace library." | 1758 "Unload the Whitespace library." |
1761 (global-whitespace-mode -1) | 1759 (let (whitespace-mode) ;; so g-w-m thinks it is nil in all buffers |
1760 (global-whitespace-mode -1)) | |
1762 ;; continue standard unloading | 1761 ;; continue standard unloading |
1763 nil) | 1762 nil) |
1764 | 1763 |
1765 (provide 'whitespace) | 1764 (provide 'whitespace) |
1766 | 1765 |