summaryrefslogtreecommitdiff
path: root/lisp/whitespace.el
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>2011-01-12 15:11:40 +0900
committerKenichi Handa <handa@m17n.org>2011-01-12 15:11:40 +0900
commit07ee9351461ff93feabd66f36ccfdc0ff7b5dcfc (patch)
treec5c619a64600c6d76b3c3134037baeabf73d191b /lisp/whitespace.el
parente7ca0062a4899a2cc5f8b0793eb0bca58efea855 (diff)
parentae01d7ca64c60e98e2a37231c4b33271c5f78f31 (diff)
downloademacs-07ee9351461ff93feabd66f36ccfdc0ff7b5dcfc.tar.gz
merge emacs-23
Diffstat (limited to 'lisp/whitespace.el')
-rw-r--r--lisp/whitespace.el3
1 files changed, 2 insertions, 1 deletions
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)))