[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104097: * lisp/whitespace.el (whites
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104097: * lisp/whitespace.el (whitespace-trailing-regexp): Don't rely on the |
Date: |
Tue, 03 May 2011 22:02:09 -0300 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104097
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2011-05-03 22:02:09 -0300
message:
* lisp/whitespace.el (whitespace-trailing-regexp): Don't rely on the
internal encoding (e.g. tibetan zero is not whitespace).
(global-whitespace-mode): Prefer save-current-buffer.
(whitespace-trailing-regexp): Remove useless save-match-data.
(whitespace-empty-at-bob-regexp): Minor simplification.
modified:
lisp/ChangeLog
lisp/whitespace.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-05-03 15:33:05 +0000
+++ b/lisp/ChangeLog 2011-05-04 01:02:09 +0000
@@ -1,3 +1,11 @@
+2011-05-04 Stefan Monnier <address@hidden>
+
+ * whitespace.el (whitespace-trailing-regexp): Don't rely on the
+ internal encoding (e.g. tibetan zero is not whitespace).
+ (global-whitespace-mode): Prefer save-current-buffer.
+ (whitespace-trailing-regexp): Remove useless save-match-data.
+ (whitespace-empty-at-bob-regexp): Minor simplification.
+
2011-05-03 Chong Yidong <address@hidden>
* emacs-lisp/autoload.el (generated-autoload-file): Doc fix (Bug#7989).
=== modified file 'lisp/whitespace.el'
--- a/lisp/whitespace.el 2011-04-30 15:15:07 +0000
+++ b/lisp/whitespace.el 2011-05-04 01:02:09 +0000
@@ -800,13 +800,12 @@
(defcustom whitespace-trailing-regexp
- "\\(\\(\t\\| \\|\xA0\\|\x8A0\\|\x920\\|\xE20\\|\xF20\\)+\\)$"
+ "\\([\t \u00A0]+\\)$"
"Specify trailing characters regexp.
If you're using `mule' package, there may be other characters besides:
- \" \" \"\\t\" \"\\xA0\" \"\\x8A0\" \"\\x920\" \"\\xE20\" \
-\"\\xF20\"
+ \" \" \"\\t\" \"\\u00A0\"
that should be considered blank.
@@ -1133,7 +1132,7 @@
(noninteractive ; running a batch job
(setq global-whitespace-mode nil))
(global-whitespace-mode ; global-whitespace-mode on
- (save-excursion
+ (save-current-buffer
(add-hook 'find-file-hook 'whitespace-turn-on-if-enabled)
(add-hook 'after-change-major-mode-hook 'whitespace-turn-on-if-enabled)
(dolist (buffer (buffer-list)) ; adjust all local mode
@@ -1141,7 +1140,7 @@
(unless whitespace-mode
(whitespace-turn-on-if-enabled)))))
(t ; global-whitespace-mode off
- (save-excursion
+ (save-current-buffer
(remove-hook 'find-file-hook 'whitespace-turn-on-if-enabled)
(remove-hook 'after-change-major-mode-hook
'whitespace-turn-on-if-enabled)
(dolist (buffer (buffer-list)) ; adjust all local mode
@@ -1526,7 +1525,7 @@
;; whole buffer
(t
(save-excursion
- (save-match-data
+ (save-match-data ;FIXME: Why?
;; PROBLEM 1: empty lines at bob
;; PROBLEM 2: empty lines at eob
;; ACTION: remove all empty lines at bob and/or eob
@@ -1598,7 +1597,7 @@
overwrite-mode ; enforce no overwrite
tmp)
(save-excursion
- (save-match-data
+ (save-match-data ;FIXME: Why?
;; PROBLEM 1: 8 or more SPACEs at bol
(cond
;; ACTION: replace 8 or more SPACEs at bol by TABs, if
@@ -1870,7 +1869,7 @@
(interactive "r")
(setq force (or current-prefix-arg force))
(save-excursion
- (save-match-data
+ (save-match-data ;FIXME: Why?
(let* ((has-bogus nil)
(rstart (min start end))
(rend (max start end))
@@ -2412,9 +2411,8 @@
"Match trailing spaces which do not contain the point at end of line."
(let ((status t))
(while (if (re-search-forward whitespace-trailing-regexp limit t)
- (save-match-data
- (= whitespace-point (match-end 1))) ;; loop if point at eol
- (setq status nil))) ;; end of buffer
+ (= whitespace-point (match-end 1)) ;; Loop if point at eol.
+ (setq status nil))) ;; End of buffer.
status))
@@ -2428,9 +2426,7 @@
((= b 1)
(setq r (and (/= whitespace-point 1)
(looking-at whitespace-empty-at-bob-regexp)))
- (if r
- (set-marker whitespace-bob-marker (match-end 1))
- (set-marker whitespace-bob-marker b)))
+ (set-marker whitespace-bob-marker (if r (match-end 1) b)))
;; inside bob empty region
((<= limit whitespace-bob-marker)
(setq r (looking-at whitespace-empty-at-bob-regexp))
@@ -2441,9 +2437,7 @@
;; intersection with end of bob empty region
((<= b whitespace-bob-marker)
(setq r (looking-at whitespace-empty-at-bob-regexp))
- (if r
- (set-marker whitespace-bob-marker (match-end 1))
- (set-marker whitespace-bob-marker b)))
+ (set-marker whitespace-bob-marker (if r (match-end 1) b)))
;; it is not inside bob empty region
(t
(setq r nil)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104097: * lisp/whitespace.el (whitespace-trailing-regexp): Don't rely on the,
Stefan Monnier <=