diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-09-19 14:06:14 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-09-19 14:06:14 -0400 |
| commit | b6072fa6a4f38a9def8080f924f0fa8befe180ed (patch) | |
| tree | 2740e57a99db5a75914e7de7c5ddfa14e3d36f93 | |
| parent | 85cb5d5706296814be7d116cbbd497f6e5b1ac4c (diff) | |
| download | emacs-b6072fa6a4f38a9def8080f924f0fa8befe180ed.tar.gz | |
* lisp/whitespace.el (whitespace-newline-mode): Disable it right.
Fixes: debbugs:9550
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/whitespace.el | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d748c1a967c..344e4ab9dfa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-09-19 Stefan Monnier <monnier@iro.umontreal.ca> + + * whitespace.el (whitespace-newline-mode): Disable it right (bug#9550). + 2011-09-19 Michael Albinus <michael.albinus@gmx.de> * net/tramp-sh.el (tramp-inline-compress-commands): Add "xz". diff --git a/lisp/whitespace.el b/lisp/whitespace.el index 89f078a5063..e0bc74343d2 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el @@ -1105,8 +1105,8 @@ See also `whitespace-newline' and `whitespace-display-mappings'." :global nil :group 'whitespace (let ((whitespace-style '(face newline-mark newline))) - (whitespace-mode whitespace-newline-mode) - ;; sync states (running a batch job) + (whitespace-mode (if whitespace-newline-mode 1 -1)) + ;; Sync states (running a batch job). (setq whitespace-newline-mode whitespace-mode))) |