diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-01-15 12:03:38 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-01-15 12:03:38 -0800 |
| commit | 362b9d483c714a8fd87966ddbd8686850f870e34 (patch) | |
| tree | e37a94fe030c9361fa28b4f3f5c8910cc7ab8448 /lisp/whitespace.el | |
| parent | dab7376027ea499962b2916652c6f30b40eac6d9 (diff) | |
| parent | 0ad254447b7542284a2eb3c63b0732edb9409af7 (diff) | |
| download | emacs-362b9d483c714a8fd87966ddbd8686850f870e34.tar.gz | |
Merge from emacs-23 branch.
Diffstat (limited to 'lisp/whitespace.el')
| -rw-r--r-- | lisp/whitespace.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/whitespace.el b/lisp/whitespace.el index 6a8b3b671e8..16f9bb451f5 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))) |