git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] vimdiff: fix 'vimdiff3' behavior (colors + no extra key press)

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Aug 6, 2022, 19:39 UTC
Message-ID
<CAMP44s1YegUqFzw8L==q2QOmh-6WCJdXYSXUvz8GPCrXuYRVPQ@mail.gmail.com>
In-Reply-To
<20220806183757.72168-1-greenfoo@u92.eu>
On Sat, Aug 6, 2022 at 1:38 PM Fernando Ramos <greenfoo@u92.eu> wrote:
Show 12 quoted lines
>
> 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
Previous: Fernando RamosNext: Fernando Ramos
Message 9 of 15 in “mergetools: vimdiff3: fix regression”
  1. 0/2 mergetools: vimdiff3: fix regressionFelipe Contreras, Aug 2, 2022
  2. 1/2 mergetools: vimdiff3: make it work as intendedFelipe Contreras, Aug 2, 2022
  3. 2/2 mergetools: vimdiff3: fix diffopt optionsFelipe Contreras, Aug 2, 2022
  4. Fernando RamosAug 6, 2022
  5. Fernando RamosAug 6, 2022
  6. Felipe ContrerasAug 6, 2022
  7. Fernando RamosAug 6, 2022
  8. vimdiff: fix 'vimdiff3' behavior (colors + no extra key press)Fernando Ramos, Aug 6, 2022
  9. Felipe ContrerasAug 6, 2022
  10. Fernando RamosAug 6, 2022
  11. vimdiff: fix 'vimdiff3' behavior (colors + no extra key press)Fernando Ramos, Aug 6, 2022
  12. Felipe ContrerasAug 7, 2022
  13. Felipe ContrerasAug 6, 2022
  14. Fernando RamosAug 6, 2022
  15. Felipe ContrerasAug 7, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.