diff options
| author | Vinicius Jose Latorre <viniciusjl@ig.com.br> | 2011-10-30 22:37:09 -0200 |
|---|---|---|
| committer | Vinicius Jose Latorre <viniciusjl@ig.com.br> | 2011-10-30 22:37:09 -0200 |
| commit | 84bd6e9e02c051816d8ba8e31fec2c3f912ae8fa (patch) | |
| tree | a29cf84f17a4f8ada7b6d697ecd5a0670adc9c36 | |
| parent | c2ff3c02a4dc328157427a4c045494edd789d204 (diff) | |
| download | emacs-84bd6e9e02c051816d8ba8e31fec2c3f912ae8fa.tar.gz | |
Disable whitespace-newline-mode properly.
| -rwxr-xr-x[-rw-r--r--] | etc/images/icons/allout-widgets/light-bg/locked-encrypted.png | bin | 210 -> 210 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png | bin | 202 -> 202 bytes | |||
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/whitespace.el | 14 |
4 files changed, 15 insertions, 5 deletions
diff --git a/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png b/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png Binary files differindex a6bc3e99a7a..a6bc3e99a7a 100644..100755 --- a/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png +++ b/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png diff --git a/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png b/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png Binary files differindex e70d075690a..e70d075690a 100644..100755 --- a/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png +++ b/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e65029b0c97..74d578abf56 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-10-30 Vinicius Jose Latorre <viniciusjl@ig.com.br> + + * whitespace.el: New version 13.2.2. + (whitespace-newline-mode): Disable properly. Reported by Sarah + <EmacsWiki>. + 2011-10-30 Ulf Jasper <ulf.jasper@web.de> * net/newst-treeview.el: Remove "Time-stamp". diff --git a/lisp/whitespace.el b/lisp/whitespace.el index 8dc1996734d..3cbc41e84c0 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el @@ -5,7 +5,7 @@ ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br> ;; Keywords: data, wp -;; Version: 13.2.1 +;; Version: 13.2.2 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre ;; This file is part of GNU Emacs. @@ -1102,10 +1102,14 @@ See also `whitespace-newline' and `whitespace-display-mappings'." :init-value nil :global nil :group 'whitespace - (let ((whitespace-style '(face newline-mark newline))) - (whitespace-mode (if whitespace-newline-mode 1 -1)) - ;; Sync states (running a batch job). - (setq whitespace-newline-mode whitespace-mode))) + (cond + (whitespace-newline-mode + (let ((whitespace-style '(face newline-mark newline))) + (whitespace-mode whitespace-newline-mode))) + (t + (whitespace-mode -1))) + ;; sync states (running a batch job) + (setq whitespace-newline-mode whitespace-mode)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
