diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-01-10 19:14:25 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-01-10 19:14:25 -0500 |
| commit | cfab9f9bd7e5ab73427cb2afc11d0defeb3b8588 (patch) | |
| tree | 0c7464f4fbf3520755cf63545b4072a31bbce6a1 | |
| parent | 01d70c32ce23b9a28f27467444d087afce51607f (diff) | |
| download | emacs-cfab9f9bd7e5ab73427cb2afc11d0defeb3b8588.tar.gz | |
* whitespace.el (global-whitespace-newline-mode): Fix call
to minor mode which used nil accidentally to mean "turn off".
Fixes: debbugs:7810
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/whitespace.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index fc51f86bc37..4553b6ed28c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-01-11 Stefan Monnier <monnier@iro.umontreal.ca> + + * whitespace.el (global-whitespace-newline-mode): Fix call (bug#7810) + to minor mode which used nil accidentally to mean "turn off". + 2011-01-10 Michael Albinus <michael.albinus@gmx.de> * net/tramp.el (tramp-find-inline-compress) diff --git a/lisp/whitespace.el b/lisp/whitespace.el index 353d7fef189..6608c0c2c50 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el @@ -1188,7 +1188,8 @@ See also `whitespace-newline' and `whitespace-display-mappings'." :global t :group 'whitespace (let ((whitespace-style '(newline-mark newline))) - (global-whitespace-mode global-whitespace-newline-mode) + (global-whitespace-mode (if global-whitespace-newline-mode + 1 -1)) ;; sync states (running a batch job) (setq global-whitespace-newline-mode global-whitespace-mode))) |