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

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 49277 in the body.
You can then email your comments to 49277 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Trust me I am a Doctor <pillule <at> riseup.net>
To: bug-gnu-emacs <at> gnu.org
Subject: 28.0.50; [PATCH] Fix ediff3 with window-combinaison-resize
Date: Tue, 29 Jun 2021 18:24:34 +0200

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

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.

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

Message #8 received at 49277 <at> debbugs.gnu.org (full text, mbox):

From: martin rudalics <rudalics <at> gmx.at>
To: Trust me I am a Doctor <pillule <at> riseup.net>, 49277 <at> debbugs.gnu.org
Subject: Re: bug#49277: 28.0.50; [PATCH] Fix ediff3 with
 window-combinaison-resize
Date: Wed, 30 Jun 2021 09:37:46 +0200

> 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

Message #11 received at 49277 <at> debbugs.gnu.org (full text, mbox):

From: marmote-te <marmot-te <at> riseup.net>
To: martin rudalics <rudalics <at> gmx.at>
Cc: 49277 <at> debbugs.gnu.org
Subject: Re: 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.

--

Message #14 received at 49277 <at> debbugs.gnu.org (full text, mbox):

From: Lars Ingebrigtsen <larsi <at> gnus.org>
To: marmote-te <marmot-te <at> riseup.net>
Cc: 49277 <at> debbugs.gnu.org, martin rudalics <rudalics <at> gmx.at>
Subject: Re: bug#49277: 28.0.50; [PATCH] Fix ediff3 with
 window-combinaison-resize
Date: Mon, 19 Jul 2021 18:07:25 +0200

marmote-te <marmot-te <at> riseup.net> writes:

> 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.

Martin, did this version of the patch look OK to you?

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Message #17 received at 49277 <at> debbugs.gnu.org (full text, mbox):

From: martin rudalics <rudalics <at> gmx.at>
To: Lars Ingebrigtsen <larsi <at> gnus.org>, marmote-te <marmot-te <at> riseup.net>
Cc: 49277 <at> debbugs.gnu.org
Subject: Re: bug#49277: 28.0.50; [PATCH] Fix ediff3 with
 window-combinaison-resize
Date: Tue, 20 Jul 2021 09:20:56 +0200

> Martin, did this version of the patch look OK to you?

So far it's OK here with

(custom-set-variables
 '(ediff-split-window-function 'split-window-horizontally)
 '(ediff-window-setup-function 'ediff-setup-windows-plain))

but with plain

(custom-set-variables
 '(ediff-window-setup-function 'ediff-setup-windows-plain))

`ediff3' makes the topmost window occupy half of the frame which is not
TRT.

martin

Message #20 received at 49277 <at> debbugs.gnu.org (full text, mbox):

From: Trust me I am a Doctor <pillule <at> riseup.net>
To: martin rudalics <rudalics <at> gmx.at>
Cc: 49277 <at> debbugs.gnu.org, Lars Ingebrigtsen <larsi <at> gnus.org>
Subject: Re: bug#49277: 28.0.50; [PATCH] Fix ediff3 with
 window-combinaison-resize
Date: Wed, 21 Jul 2021 13:12:57 +0200

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

please try this one. I swear it is not again the same buggy patch.

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

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

--

Message #23 received at 49277 <at> debbugs.gnu.org (full text, mbox):

From: martin rudalics <rudalics <at> gmx.at>
To: Trust me I am a Doctor <pillule <at> riseup.net>
Cc: 49277 <at> debbugs.gnu.org, Lars Ingebrigtsen <larsi <at> gnus.org>
Subject: Re: bug#49277: 28.0.50; [PATCH] Fix ediff3 with
 window-combinaison-resize
Date: Wed, 18 Aug 2021 10:02:07 +0200

> please try this one. I swear it is not again the same buggy patch.

Installed as well.  Please have a look and consider closing this and the
other bug.

Thanks, martin

Message #28 received at 49277 <at> debbugs.gnu.org (full text, mbox):

From: Trust me I am a Doctor <pillule <at> riseup.net>
To: martin rudalics <rudalics <at> gmx.at>
Cc: 49277 <at> debbugs.gnu.org, Lars Ingebrigtsen <larsi <at> gnus.org>
Subject: Re: bug#49277: 28.0.50; [PATCH] Fix ediff3 with
 window-combinaison-resize
Date: Wed, 18 Aug 2021 20:25:10 +0200

> Installed as well.  Please have a look and consider closing this and the
> other bug.
>
> Thanks, martin


Fine, thanks for your time Martin.

I am closing them.
--

Message #31 received at 49277 <at> debbugs.gnu.org (full text, mbox):

From: Trust me I am a Doctor <pillule <at> riseup.net>
To: control <at> debbugs.gnu.org
Cc: 49277 <at> debbugs.gnu.org
Subject: Re: bug#49277: 28.0.50; [PATCH] Fix ediff3 with
 window-combinaison-resize
Date: Wed, 18 Aug 2021 20:25:58 +0200

close 49277
thanks

--

Previous Next

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