Skip to content

Fix ediff unknown terminal type error with plain window setup #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericdallo merged 1 commit into from
Oct 9, 2025
Merged

Fix ediff unknown terminal type error with plain window setup #61

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion eca-diff.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,11 @@ system (it ignores those popup rules for the generated ediff buffers)."

;; Start Ediff with error handling
(condition-case err
(ediff-buffers buf-orig buf-new)
(let ((ediff-window-setup-function
(if (daemonp)
'ediff-setup-windows-plain
ediff-window-setup-function)))
(ediff-buffers buf-orig buf-new))
(error
;; On error, remove hooks and restore windows
(remove-hook 'ediff-quit-hook cleanup-fn)
Expand Down