From fa257eefd2edf0e186b0c3bd465ffa6afda12993 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Tue, 12 Dec 2000 14:13:13 +0000 Subject: [PATCH] (perform-replace): Don't use an empty match adjacent to a non-empty match when computing the next match before the replacement is performed. --- lisp/replace.el | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/replace.el b/lisp/replace.el index 6fc67ad87bc..2a0735cfe5a 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -965,15 +965,20 @@ which will run faster and probably do exactly what you want." (setq nonempty-match (/= (nth 0 real-match-data) (nth 1 real-match-data))) - ;; If the match is empty, record that the next one can't be adjacent. + ;; If the match is empty, record that the next one can't be + ;; adjacent. + ;; Otherwise, if matching a regular expression, do the next ;; match now, since the replacement for this match may ;; affect whether the next match is adjacent to this one. + ;; If that match is empty, don't use it. (setq match-again (and nonempty-match (or (not regexp-flag) (and (looking-at search-string) - (match-data))))) + (let ((match (match-data))) + (and (/= (nth 0 match) (nth 1 match)) + match)))))) ;; Calculate the replacement string, if necessary. (when replacements -- 2.39.2