aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinicius Jose Latorre2010-12-08 17:25:11 -0200
committerVinicius Jose Latorre2010-12-08 17:25:11 -0200
commit1649810227aa7f03ff45908fb8a6c9dbaa191f0b (patch)
treec507210b81cdc52669aff92316a6ca5cbb979577
parent71044abebeccebe885f3540e3fd4a27a1f7d6537 (diff)
downloademacs-1649810227aa7f03ff45908fb8a6c9dbaa191f0b.tar.gz
emacs-1649810227aa7f03ff45908fb8a6c9dbaa191f0b.zip
New version 13.2. (Bug#7582)
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/whitespace.el6
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb797763cbd..2a47c160100 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-12-08 Vinicius Jose Latorre <viniciusjl@ig.com.br>
2
3 * whitespace.el: New version 13.2.
4 (whitespace-cleanup-region): Tiny code fix. (Bug#7582)
5
12010-12-08 Karl Fogel <kfogel@red-bean.com> 62010-12-08 Karl Fogel <kfogel@red-bean.com>
2 7
3 * bookmark.el: Adjust parameter names and doc strings to resolve 8 * bookmark.el: Adjust parameter names and doc strings to resolve
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 4b8b9a61173..57858ed4067 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -6,7 +6,7 @@
6;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br> 6;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
7;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br> 7;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
8;; Keywords: data, wp 8;; Keywords: data, wp
9;; Version: 13.1 9;; Version: 13.2
10;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre 10;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
11 11
12;; This file is part of GNU Emacs. 12;; This file is part of GNU Emacs.
@@ -1652,12 +1652,12 @@ documentation."
1652 (whitespace-replace-action 1652 (whitespace-replace-action
1653 (if whitespace-indent-tabs-mode 'tabify 'untabify) 1653 (if whitespace-indent-tabs-mode 'tabify 'untabify)
1654 rstart rend whitespace-space-before-tab-regexp 1654 rstart rend whitespace-space-before-tab-regexp
1655 (if whitespace-indent-tabs-mode 1 2))) 1655 (if whitespace-indent-tabs-mode 0 2)))
1656 ;; ACTION: replace SPACEs before TAB by TABs. 1656 ;; ACTION: replace SPACEs before TAB by TABs.
1657 ((memq 'space-before-tab::tab whitespace-style) 1657 ((memq 'space-before-tab::tab whitespace-style)
1658 (whitespace-replace-action 1658 (whitespace-replace-action
1659 'tabify rstart rend 1659 'tabify rstart rend
1660 whitespace-space-before-tab-regexp 1)) 1660 whitespace-space-before-tab-regexp 0))
1661 ;; ACTION: replace TABs by SPACEs. 1661 ;; ACTION: replace TABs by SPACEs.
1662 ((memq 'space-before-tab::space whitespace-style) 1662 ((memq 'space-before-tab::space whitespace-style)
1663 (whitespace-replace-action 1663 (whitespace-replace-action