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

Re: [PATCH v3 7/7] mergetools: vimdiff: restore selective diff mode

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 10, 2022, 08:45 UTC
Message-ID
<xmqqmtccpjv8.fsf@gitster.g>
In-Reply-To
<YvHv+EcNyHXCNZhK@zacax395.localdomain>
Fernando Ramos <greenfoo@u92.eu> writes:
Show 26 quoted lines
> On 22/08/08 08:08PM, Felipe Contreras wrote:
>> 
>> Notice that after reorganizing the tab handling my layout becomes really simple:
>> 
>>   set hidden diffopt-=hiddenoff | silent execute 'bufdo diffthis' | 4b
>>
>
> Thanks! I really like this new approach.
>
> I also manually tested your new series (with and without .vimrc) and it works as
> expected in all listed test cases.
>
> This last series gets the best of both worlds:
>
>   - Highglihting works in single window tabs even when there is just one tab
>   
>   - Single tab layouts are not treated differently
>
>   - Generates shorter (easier to understand!) vim command strings (nice!)
>
>   - Opens the gate for a future configuration option that lets you enable "all
>     buffers diff mode" even if they are not visible in a given tab (maybe this
>     could be a new syntax token, *, that "marks" a tab to work in this mode?)
>
> So, definitely a great work. Thanks for the deeper look at the problem and this
> brilliant solution :)
Is that a "Reviewed-by:" I should add while queuing these 7 patches?
Thanks, both.
Previous: Felipe ContrerasNext: Junio C Hamano
Message 12 of 13 in “mergetools: vimdiff: regression fixes and improvements”
  1. 0/7 mergetools: vimdiff: regression fixes and improvementsFelipe Contreras, Aug 9, 2022
  2. 1/7 mergetools: vimdiff: fix commentFelipe Contreras, Aug 9, 2022
  3. 2/7 mergetools: vimdiff: make vimdiff3 actually workFelipe Contreras, Aug 9, 2022
  4. 3/7 mergetools: vimdiff: silence annoying messagesFelipe Contreras, Aug 9, 2022
  5. 4/7 mergetools: vimdiff: fix for diffoptFelipe Contreras, Aug 9, 2022
  6. 6/7 mergetools: vimdiff: rework tab logicFelipe Contreras, Aug 9, 2022
  7. 5/7 mergetools: vimdiff: fix single window layoutsFelipe Contreras, Aug 9, 2022
  8. 7/7 mergetools: vimdiff: restore selective diff modeFelipe Contreras, Aug 9, 2022
  9. Felipe ContrerasAug 9, 2022
  10. Fernando RamosAug 9, 2022
  11. Felipe ContrerasAug 9, 2022
  12. Junio C HamanoAug 10, 2022
  13. Junio C HamanoAug 10, 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.