procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't access overriding-text-conversion-style when unbound

Browse source 
* lisp/replace.el (perform-replace): Don't access
overriding-text-conversion-style when unbound, and also avoid
needlessly polluting this symbol with a binding.  (bug#76371)
This commit is contained in:
Po Lu 2025-02-18 20:58:32 +08:00
parent 17bf6b9efe
commit 0cf3823463
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lisp/replace.el
View file

@ -2880,7 +2880,8 @@ characters."
(region-filter nil)
;; Disable text conversion during the replacement operation.
(old-text-conversion-style overriding-text-conversion-style)
(old-text-conversion-style (and (boundp 'overriding-text-conversion-style)
overriding-text-conversion-style))
overriding-text-conversion-style
;; Data for the next match. If a cons, it has the same format as
@ -2940,10 +2941,9 @@ characters."
(push-mark)
(undo-boundary)
(when query-flag
(when (and query-flag (fboundp 'set-text-conversion-style))
(setq overriding-text-conversion-style nil)
(when (fboundp 'set-text-conversion-style)
(set-text-conversion-style text-conversion-style)))
(set-text-conversion-style text-conversion-style))
(unwind-protect
;; Loop finding occurrences that perhaps should be replaced.
(while (and keep-going
@ -3362,12 +3362,11 @@ characters."
(replace-dehighlight)
(when region-filter
(remove-function isearch-filter-predicate region-filter))
(when query-flag
(when (and query-flag (fboundp 'set-text-conversion-style))
;; Resume text conversion.
(setq overriding-text-conversion-style
old-text-conversion-style)
(when (fboundp 'set-text-conversion-style)
(set-text-conversion-style text-conversion-style))))
(set-text-conversion-style text-conversion-style)))
(or unread-command-events
(message (ngettext "Replaced %d occurrence%s"
"Replaced %d occurrences%s"