Re: [PATCH v2 2/9] mergetools: vimdiff: shuffle single window case

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Aug 7, 2022, 15:44 UTC
Message-ID: <CAMP44s388FBn7pynSQQNbo+ru-+7pm4gpUuhgu-jHqJP7tJQAg@mail.gmail.com>
In-Reply-To: <Yu/QQe4lz2MhiCQp@zacax395.localdomain>

On Sun, Aug 7, 2022 at 9:46 AM Fernando Ramos <greenfoo@u92.eu> wrote:

Show 16 quoted lines

>
> On 22/08/06 09:49PM, Felipe Contreras wrote:
> >
> > +     # A single window is handled specially
> > +
> > +     if ! echo "$LAYOUT" | grep ",\|/" >/dev/null
> > +     then
> > +             CMD=$(gen_cmd_aux "$LAYOUT")
> > +             FINAL_CMD="-c \"$CMD | bufdo diffthis\" -c \"tabfirst\""
> > +             return
> > +     fi
>
> If you make this change, it fixes the first issue I was referring to in [1]
>
> -       if ! echo "$LAYOUT" | grep ",\|/" >/dev/null
> +       if ! echo "$LAYOUT" | grep ",\|/\|\+" >/dev/null

Yeah, but 1) that's a problem in master, not with this patch, and 2) as you already mentioned the colors are not shown so it's debatable if it's really "fixed".

BTW, much easier to do "[,/|]" instead.

-- 
Felipe Contreras