Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-06-14 12:31:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix control window setup in 'ediff-setup-windows-plain-compare' (Bug#80809)

Browse source 
* lisp/vc/ediff-wind.el (ediff-setup-windows-plain-compare): Do
not call 'display-buffer-in-direction' directly (Bug#80809).
This commit is contained in:
Martin Rudalics 2026-04-20 10:33:55 +02:00
parent 6de3bc0bf2
commit b7eb715a13
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lisp/vc/ediff-wind.el
View file

@ -453,9 +453,15 @@ BODY, instead returning nil."
(set-window-start wind-A wind-A-start) (set-window-start wind-A wind-A-start)
(set-window-start wind-B wind-B-start)) (set-window-start wind-B wind-B-start))
(select-window (display-buffer-in-direction ;; Do not call 'display-buffer-in-direction' directly (Bug#80809).
control-buffer ;; If making a new window fails, reuse an existing one.
'((direction . bottom)))) (pop-to-buffer
control-buffer
'(display-buffer-in-direction
;; Don't let 'display-buffer' put the control buffer into a new
;; frame - ‘ediff-cleanup-mess’ can't handle it (if you insist,
;; run 'quit-restore-window' instead of 'delete-window' there).
. ((direction . bottom) (pop-up-frames . nil))))
(ediff-setup-control-buffer control-buffer))) (ediff-setup-control-buffer control-buffer)))
;; dispatch an appropriate window setup function ;; dispatch an appropriate window setup function