Re: tabs, git diff and git apply

[Stefan Monnier <monnier@iro.umontreal.ca>]

> Some three lines appearing in my window.c as
>
>       if (WINDOWP (w->contents))
> 	cont = foreach_window_1 (XWINDOW (w->contents), fn, user_data);
>       else
>
> appear in *shell* after git diff as
>
> +      if (WINDOWP (w->contents))
> + 	cont = foreach_window_1 (XWINDOW (w->contents), fn, user_data);
> +      else
>
> Note the extra space after the "+" in the second line and the off-by-one
> indentation.

Any chance you're using non-unified diffs?  These match the
"[-+ ] <LINE>" pattern, contrary to unified diffs which use "[-+ ]<LINE>".

IOW, maybe there's nothing wrong.

> A subsequent git apply then complains about
>
> /home/martin/temp/master..changes-2020-11-28.diff:3847: space before tab in indent.
>  	cont = foreach_window_1 (XWINDOW (w->contents), fn, user_data);

Hard to tell without more info.
Have you tried it in an xterm rather than withing a *shell* buffer?


        Stefan