[vim/vim] Missaligned tab stops in .diff and .patch files (#8366)

[Timothy Madden]

Describe the bug
In a .diff or .patch file, tab stops within the text appear off-by-one

To Reproduce
Open a .diff or .patch file that uses tabs. Because diff inserts a new column at character position 1, for the '+', '-' and ' ' characters, tab stops in the rest of the content show up wrong

Expected behavior
In a .diff or .patch files, tab stops should start in column 2 instead of column 1. So instead of having tab stops in columns 1, 8, 16, 24, 32..., they should be in columns 2, 9, 17, 25, 33...

Screenshots

gitattributes.diff.gz

Environment (please complete the following information):

• VIM - Vi IMproved 8.2 (2019 Dec 12, compiled Dec 12 2019 13:19:27)

Additional context
Only affects .diff and .patch files

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or unsubscribe.

[Bram Moolenaar]

I think you can do this with ":set vartabstop=1,8".

[Timothy Madden]

Yes, thank you, that fixed my .diffs

I am not sure I understand the logic, though, my understanding would be
that I need vartabstop=7,8.

It would be nice if you could make this fix the default for .diff and
.patch files.

Otherwise this ticket should now be solved.
And thank you for such a great text editor!

On Fri, Jun 11, 2021 at 8:55 PM Bram Moolenaar ***@***.***>
wrote:

> I think you can do this with ":set vartabstop=1,8".
>
> —

> You are receiving this because you authored the thread.

> Reply to this email directly, view it on GitHub

> <https://github.com/vim/vim/issues/8366#issuecomment-859745924>, or
> unsubscribe
> <https://github.com/notifications/unsubscribe-auth/AAC4QLD7YVFEDBWYRB4M7F3TSJEXJANCNFSM46REJMPQ>
> .

[Bram Moolenaar]

It's not that easy, some diff files have a two character margin. We could perhaps detect that.

[Bram Moolenaar]

Closed #8366.