Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-16 17:24:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix query-replace at EOB

Browse source 
* lisp/replace.el (replace-match-maybe-edit): Avoid clobbering
match-data with outdated buffer position.  (Bug#67124)
This commit is contained in:
Eli Zaretskii 2023-11-15 15:15:35 +02:00
parent 8fd26c0307
commit 8b458aea86
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lisp/replace.el
View file

@ -2644,8 +2644,11 @@ passed in. If LITERAL is set, no checking is done, anyway."
(replace-match newtext fixedcase literal)
;; `query-replace' undo feature needs the beginning of the match position,
;; but `replace-match' may change it, for instance, with a regexp like "^".
;; Ensure that this function preserves the match data (Bug#31492).
(set-match-data match-data)
;; Ensure that this function preserves the beginning of the match position
;; (bug#31492). But we need to avoid clobbering the end of the match with
;; the original match-end position, since `replace-match' could have made
;; that incorrect or even invalid (bug#67124).
(set-match-data (list (car match-data) (nth 1 (match-data))))
;; `replace-match' leaves point at the end of the replacement text,
;; so move point to the beginning when replacing backward.
(when backward (goto-char (nth 0 match-data)))