GNU bug report logs - #49277
28.0.50; [PATCH] Fix ediff3 with window-combinaison-resize

Previous Next

Full log

View this message in rfc822 format

From: marmote-te <marmot-te <at> riseup.net>
To: martin rudalics <rudalics <at> gmx.at>
Cc: 49277 <at> debbugs.gnu.org
Subject: bug#49277: 28.0.50; [PATCH] Fix ediff3 with window-combinaison-resize
Date: Thu, 08 Jul 2021 15:33:50 +0200

[Message part 1 (text/plain, inline)]

martin rudalics <rudalics <at> gmx.at> writes:

>> I have a bug when calling ediff3, the layout is not a balanced.
>>
>> Ultimately I found that combining this settings were the culprit :
>>
>> (setq window-combination-resize t
>>        even-window-sizes nil)
>>
>> ;; you can test it with eg :
>> (setq default-directory "/home/user")
>> (ediff3 ".bashrc"
>>          ".bash_history"
>>          ".bash_logout")
>>
>> Removing the manual resizing when splitting windows and relying rather
>> on 'window-combinaison-resize' to balance the layout, solve the issue.
>
> I think we can easily do that but it does not handle the
>
> (setq window-combination-resize t
>       even-window-sizes nil
>       ediff-window-setup-function 'ediff-setup-windows-plain)
>
> case here.  Shouldn't we fix that too?
>
> Thanks, martin

Yes, I missed that one ; it worked only in plain window with
(setq ediff-split-window-function #'split-window-horizontally)

I guess that is the control buffer that is interfering somehow
with the resizing ?

I tried to apply on it a 'window-preserve parameter on its window,
without much success.

So in this one, for the plain window setup, I only create the control
window at the end of the layout.
It does not seemed necessary to setup the control buffer twice.

[0002-Fix-ediff3-with-window-combinaison-resize.patch (text/x-diff, attachment)]

[Message part 3 (text/plain, inline)]

There is also the merge job layouts, that are a little bit different,
but as far I understand them, they are not affected by this issue. If it
feels cleaner, I could however apply the same modification to the setup
of the control buffer.

--

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.