From: Felipe Contreras <felipe.contreras@gmail.com>
To: Fernando Ramos <greenfoo@u92.eu>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2 2/9] mergetools: vimdiff: shuffle single window case
Date: Sun, 7 Aug 2022 10:44:29 -0500 [thread overview]
Message-ID: <CAMP44s388FBn7pynSQQNbo+ru-+7pm4gpUuhgu-jHqJP7tJQAg@mail.gmail.com> (raw)
In-Reply-To: <Yu/QQe4lz2MhiCQp@zacax395.localdomain>
On Sun, Aug 7, 2022 at 9:46 AM Fernando Ramos <greenfoo@u92.eu> wrote:
>
> 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
next prev parent reply other threads:[~2022-08-07 15:44 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-07 2:49 [PATCH v2 0/9] mergetools: vimdiff: regression fix and reorg Felipe Contreras
2022-08-07 2:49 ` [PATCH v2 1/9] mergetools: vimdiff: fix comment Felipe Contreras
2022-08-07 2:49 ` [PATCH v2 2/9] mergetools: vimdiff: shuffle single window case Felipe Contreras
2022-08-07 14:46 ` Fernando Ramos
2022-08-07 15:44 ` Felipe Contreras [this message]
2022-08-07 2:49 ` [PATCH v2 3/9] mergetools: vimdiff: add get_buf() helper Felipe Contreras
2022-08-07 2:49 ` [PATCH v2 4/9] mergetools: vimdiff: make vimdiff3 actually work Felipe Contreras
2022-08-07 2:49 ` [PATCH v2 5/9] mergetools: vimdiff: silence annoying messages Felipe Contreras
2022-08-07 2:49 ` [PATCH v2 6/9] mergetools: vimdiff: fix for diffopt Felipe Contreras
2022-08-07 2:49 ` [PATCH v2 7/9] mergetools: vimdiff: cleanup cruft Felipe Contreras
2022-08-07 2:49 ` [PATCH v2 8/9] mergetools: vimdiff: fix single window mode Felipe Contreras
2022-08-07 2:49 ` [PATCH v2 9/9] mergetools: vimdiff: use vimdiff for vimdiff3 Felipe Contreras
2022-08-07 14:46 ` Fernando Ramos
2022-08-07 7:54 ` [PATCH v2 0/9] mergetools: vimdiff: regression fix and reorg Fernando Ramos
2022-08-07 15:39 ` Felipe Contreras
2022-08-07 18:39 ` Fernando Ramos
2022-08-07 18:43 ` [PATCH 1/2] vimdiff: fix single tab mode, single window mode and colors Fernando Ramos
2022-08-07 18:43 ` [PATCH 2/2] vimdiff: update unit tests Fernando Ramos
2022-08-07 22:27 ` [PATCH v2 0/9] mergetools: vimdiff: regression fix and reorg Felipe Contreras
2022-08-08 5:34 ` [PATCH v3 0/3] mergetools: vimdiff: regression fix (vimdiff3 mode) Fernando Ramos
2022-08-08 5:34 ` [PATCH v3 1/3] mergetools: vimdiff: fix comment Fernando Ramos
2022-08-08 5:34 ` [PATCH v3 2/3] mergetools: vimdiff: fix single tab mode, single window mode and colors Fernando Ramos
2022-08-08 6:37 ` Felipe Contreras
2022-08-08 18:14 ` Fernando Ramos
2022-08-08 21:00 ` Felipe Contreras
2022-08-08 21:51 ` Fernando Ramos
2022-08-09 0:59 ` Felipe Contreras
2022-08-08 5:34 ` [PATCH v3 3/3] mergetools: vimdiff: update unit tests Fernando Ramos
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAMP44s388FBn7pynSQQNbo+ru-+7pm4gpUuhgu-jHqJP7tJQAg@mail.gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=greenfoo@u92.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).