From cfab9f9bd7e5ab73427cb2afc11d0defeb3b8588 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 10 Jan 2011 19:14:25 -0500 Subject: [PATCH] * whitespace.el (global-whitespace-newline-mode): Fix call to minor mode which used nil accidentally to mean "turn off". Fixes: debbugs:7810 --- lisp/ChangeLog | 5 +++++ lisp/whitespace.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) 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 + + * 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 * 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))) -- 2.39.5