mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Revert e061999559 that added save-match-data.

Browse source 
* lisp/isearch.el (isearch-filter-predicate): Mention precautions against
clobbering the match data in docstring (bug#49534).
This commit is contained in:
Juri Linkov 2021-07-14 02:21:17 +03:00
parent e061999559
commit dd34bef7d3
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lisp/isearch.el
View file

@ -233,6 +233,7 @@ called with the positions of the start and the end of the text
matched by Isearch and replace commands. If this function
returns nil, Isearch and replace commands will continue searching
without stopping at resp. replacing this match.
This function is expected to be careful not to clobber the match data.
If you use `add-function' to modify this variable, you can use the
`isearch-message-prefix' advice property to specify the prefix string
@ -3529,9 +3530,8 @@ Optional third argument, if t, means if fail just return nil (no error).
;; Clear RETRY unless the search predicate says
;; to skip this search hit.
(if (or (not isearch-success)
(save-match-data
(funcall isearch-filter-predicate
(match-beginning 0) (match-end 0))))
(funcall isearch-filter-predicate
(match-beginning 0) (match-end 0)))
(setq retry nil)
;; Advance point on empty matches before retrying
(when (= (match-beginning 0) (match-end 0))
@ -4049,9 +4049,8 @@ Attempt to do the search exactly the way the pending Isearch would."
;; to skip this search hit.
(if (or (not success)
(= (match-beginning 0) (match-end 0))
(save-match-data
(funcall isearch-filter-predicate
(match-beginning 0) (match-end 0))))
(funcall isearch-filter-predicate
(match-beginning 0) (match-end 0)))
(setq retry nil)))
success)
(error nil)))