From: Fernando Ramos <greenfoo@u92.eu>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2 9/9] mergetools: vimdiff: use vimdiff for vimdiff3
Date: Sun, 7 Aug 2022 16:46:04 +0200 [thread overview]
Message-ID: <Yu/QLJg516n3gJXF@zacax395.localdomain> (raw)
In-Reply-To: <20220807024941.222018-10-felipe.contreras@gmail.com>
On 22/08/06 09:49PM, Felipe Contreras wrote:
>
> diff --git a/mergetools/vimdiff b/mergetools/vimdiff
> index 34373ad92c..daeb3cf1d0 100644
> --- a/mergetools/vimdiff
> +++ b/mergetools/vimdiff
> @@ -325,7 +325,7 @@ gen_cmd () {
> if ! echo "$LAYOUT" | grep ",\|/" >/dev/null
> then
> buf=$(get_buf "$LAYOUT")
> - FINAL_CMD="-c \"set hidden diffopt-=hiddenoff | silent execute 'bufdo diffthis' | ${buf}b\""
> + FINAL_CMD="-d -c \"set hidden diffopt-=hiddenoff diffopt-=closeoff | ${buf}b | only\""
> return
> fi
I found something strange while testing this:
This is the final command that is generated now:
vim -d -c "set hidden diffopt-=hiddenoff diffopt-=closeoff | 4b | only" LOCAL BASE REMOTE MERGED
Turns out that now colors "kind of work", but not completely:
- The buffer that is shown by default ("MERGED") contains colors.
- If you switch to the "LOCAL" buffer (":buffer 1") it also contains colors.
- *But* if you switch to any of the other buffers ("BASE" with ":buffer 2"
or "REMOTE" with ":buffer 3"), there are no colors.
For some reason, the command that was generated by my patch to v1, does work (?)
and all buffers contain diff colors:
vimdiff -c "echo | silent 4b | set hidden | let tmp=bufnr('%') | silent bufdo diffthis | exe 'buffer '.tmp" LOCAL BASE REMOTE MERGED
next prev parent reply other threads:[~2022-08-07 14:46 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
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 [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Yu/QLJg516n3gJXF@zacax395.localdomain \
--to=greenfoo@u92.eu \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).