From: Felipe Contreras <felipe.contreras@gmail.com>
To: Fernando Ramos <greenfoo@u92.eu>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] vimdiff: fix 'vimdiff3' behavior (colors + no extra key press)
Date: Sat, 6 Aug 2022 14:39:37 -0500 [thread overview]
Message-ID: <CAMP44s1YegUqFzw8L==q2QOmh-6WCJdXYSXUvz8GPCrXuYRVPQ@mail.gmail.com> (raw)
In-Reply-To: <20220806183757.72168-1-greenfoo@u92.eu>
On Sat, Aug 6, 2022 at 1:38 PM Fernando Ramos <greenfoo@u92.eu> wrote:
>
> vimdiff3 was introduced in 7c147b77d3 (mergetools: add vimdiff3 mode,
> 2014-04-20) and then partially broken in 0041797449 (vimdiff: new
> implementation with layout support, 2022-03-30) in two ways:
>
> - It does not show colors unless the user has "set hidden" in his
> .vimrc file
>
> - It prompts the user to "Press ENTER" every time it runs.
>
> This patch fixes both issues by adding "set hidden" and "silent" to the
> generated command string that is used to run vim.
Although I don't see the point of the extra complexity in the case of
a single window, especially since it doesn't really work for anything
other than "MERGED", this does make vimdiff3 work again for me.
Tested-by: Felipe Contreras <felipe.contreras@gmail.com>
--
Felipe Contreras
next prev parent reply other threads:[~2022-08-06 19:39 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-02 21:41 [PATCH 0/2] mergetools: vimdiff3: fix regression Felipe Contreras
2022-08-02 21:41 ` [PATCH 1/2] mergetools: vimdiff3: make it work as intended Felipe Contreras
2022-08-02 21:41 ` [PATCH 2/2] mergetools: vimdiff3: fix diffopt options Felipe Contreras
2022-08-06 16:25 ` [PATCH 0/2] mergetools: vimdiff3: fix regression Fernando Ramos
2022-08-06 16:27 ` Fernando Ramos
2022-08-06 17:53 ` Felipe Contreras
2022-08-06 18:29 ` Fernando Ramos
2022-08-06 18:37 ` [PATCH] vimdiff: fix 'vimdiff3' behavior (colors + no extra key press) Fernando Ramos
2022-08-06 19:39 ` Felipe Contreras [this message]
2022-08-06 21:26 ` Fernando Ramos
2022-08-06 21:30 ` Fernando Ramos
2022-08-07 0:55 ` Felipe Contreras
2022-08-06 19:17 ` [PATCH 0/2] mergetools: vimdiff3: fix regression Felipe Contreras
2022-08-06 21:23 ` Fernando Ramos
2022-08-07 0:44 ` Felipe Contreras
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='CAMP44s1YegUqFzw8L==q2QOmh-6WCJdXYSXUvz8GPCrXuYRVPQ@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.
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).