Skip to content

Commit 8f8416b

Browse files
committed
gptel-rewrite: Use plain window setup in ediff
* gptel-rewrite.el (gptel--rewrite-ediff): Force Ediff to split horizontally and use a single frame. (#824) This is an experiment to produce more regular Ediff behavior.
1 parent cdf27ce commit 8f8416b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

gptel-rewrite.el

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,9 @@ BUF is the buffer to modify, defaults to the overlay buffer."
321321
(remove-hook 'ediff-quit-hook gptel--ediff-restore))))
322322
(funcall hideshow)
323323
(add-hook 'ediff-quit-hook gptel--ediff-restore)
324-
(ediff-buffers ov-buf newbuf))))
324+
(let ((ediff-window-setup-function #'ediff-setup-windows-plain)
325+
(ediff-split-window-function #'split-window-horizontally))
326+
(ediff-buffers ov-buf newbuf)))))
325327

326328
(defun gptel--rewrite-merge (&optional ovs)
327329
"Insert pending LLM responses in OVS as merge conflicts."

0 commit comments

Comments
 (0)