mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

Override 'display-buffer-overriding-action' conditionally in perform-replace

Browse source 
* lisp/replace.el (perform-replace): For 'diff' display, override
'display-buffer-overriding-action' only when it has the default value.
https://lists.gnu.org/archive/html/emacs-devel/2025-11/msg01077.html
This commit is contained in:
Juri Linkov 2025-12-01 19:29:11 +02:00
parent 310ec70648
commit 481977f597
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lisp/replace.el
View file

@ -3341,9 +3341,12 @@ characters."
(setq replaced t)) (setq replaced t))
((eq def 'diff) ((eq def 'diff)
(let ((display-buffer-overriding-action (let ((display-buffer-overriding-action
'(nil (inhibit-same-window . t)))) ;; Override only the default value.
(save-selected-window (if (equal display-buffer-overriding-action '(nil))
'(nil (inhibit-same-window . t))
display-buffer-overriding-action)))
(save-selected-window
(multi-file-replace-as-diff (multi-file-replace-as-diff
(list (or buffer-file-name (current-buffer))) (list (or buffer-file-name (current-buffer)))
from-string (or replacements next-replacement) from-string (or replacements next-replacement)