aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/whitespace.el3
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 03acd7edafa..2e4155e6c0d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-05-29 Chong Yidong <cyd@gnu.org>
2
3 * whitespace.el (whitespace-cleanup): Fix usage of
4 whitespace-empty-at-bob-regexp (Bug#11492).
5
12012-05-29 Aaron S. Hawley <aaron.s.hawley@gmail.com> 62012-05-29 Aaron S. Hawley <aaron.s.hawley@gmail.com>
2 7
3 * vc/vc.el (vc-revert, vc-rollback): Dont kill vc-diff buffer on 8 * vc/vc.el (vc-revert, vc-rollback): Dont kill vc-diff buffer on
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index e752dc56553..a529725fc38 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -1533,8 +1533,7 @@ documentation."
1533 (when (memq 'empty whitespace-style) 1533 (when (memq 'empty whitespace-style)
1534 (let (overwrite-mode) ; enforce no overwrite 1534 (let (overwrite-mode) ; enforce no overwrite
1535 (goto-char (point-min)) 1535 (goto-char (point-min))
1536 (when (re-search-forward 1536 (when (looking-at whitespace-empty-at-bob-regexp)
1537 (concat "\\`" whitespace-empty-at-bob-regexp) nil t)
1538 (delete-region (match-beginning 1) (match-end 1))) 1537 (delete-region (match-beginning 1) (match-end 1)))
1539 (when (re-search-forward 1538 (when (re-search-forward
1540 (concat whitespace-empty-at-eob-regexp "\\'") nil t) 1539 (concat whitespace-empty-at-eob-regexp "\\'") nil t)