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

Don't clobber match data in 'y-or-n-p'

Browse source 
* lisp/subr.el (y-or-n-p): Avoid clobbering caller's match data.
(Bug#61091)
This commit is contained in:
Eli Zaretskii 2023-02-04 10:15:18 +02:00
parent 4c765d93ab
commit 3a64f81ebc
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lisp/subr.el
View file

@ -3573,12 +3573,14 @@ like) while `y-or-n-p' is running)."
(if (or (zerop l) (eq ?\s (aref prompt (1- l)))) (if (or (zerop l) (eq ?\s (aref prompt (1- l))))
"" " ") "" " ")
(if dialog "" (if dialog ""
(substitute-command-keys ;; Don't clobber caller's match data.
(if help-form (save-match-data
(format "(\\`y', \\`n' or \\`%s') " (substitute-command-keys
(key-description (if help-form
(vector help-char))) (format "(\\`y', \\`n' or \\`%s') "
"(\\`y' or \\`n') "))))))) (key-description
(vector help-char)))
"(\\`y' or \\`n') "))))))))
;; Preserve the actual command that eventually called ;; Preserve the actual command that eventually called
;; `y-or-n-p' (otherwise `repeat' will be repeating ;; `y-or-n-p' (otherwise `repeat' will be repeating
;; `exit-minibuffer'). ;; `exit-minibuffer').