Two space indentation displays incorrectly in diff

[LI Xin]

Chess Griffin wrote:
> Hello,
> 
> I am working on some more doc diffs to submit and I am paying careful
> attention to the FDP Primer.  The problem is that when I insert a 
> two space indent after the first line of a <para>, it shows up as 1
> space when I create the diff -u.
> 
> This is in my .vimrc:
> 
> autocmd BufNewFile,BufRead *.sgml,*.ent,*.html,*.tex,*.xsl set
> autoindent formatoptions=tcq2l textwidth=70 shiftwidth=2
> softtabstop=2 tabstop=8
> 
> When I edit the sgml, it looks ok:
> 
>     <sect2 id="consoles-vidcontrol">
>       <title>Changing Console Video Modes</title>
> 
>       <para>The FreeBSD console default video mode may be adjusted to
>         1024x768, 1280x1024, or any other size supported by your 
>         graphics chip and monitor.  To use a different video mode, you
>         must first recompile your kernel and include two additional
>         options:</para>
> 
> But in the diff it looks like this:
> 
> +    <sect2 id="consoles-vidcontrol">
> +      <title>Changing Console Video Modes</title>
> +
> +      <para>The FreeBSD console default video mode may be adjusted to
> +       1024x768, 1280x1024, or any other size supported by your
> +       graphics chip and monitor.  To use a different video mode, you
> +       must first recompile your kernel and include two additional
> +       options:</para>
> 
> It appears that there is only a one space indent after the first <para>
> line.
> 
> I also did ":set list" on the diff and it looks like this:
> 
> +    <sect2 id="consoles-vidcontrol">$
> +      <title>Changing Console Video Modes</title>$
> +$
> +      <para>The FreeBSD console default video mode may be adjusted to$
> +^I1024x768, 1280x1024, or any other size supported by your$
> +^Igraphics chip and monitor.  To use a different video mode, you$
> +^Imust first recompile your kernel and include two additional$
> +^Ioptions:</para>$
> 
> I am stumped as to why this occurs or how to fix it.  
> 
> When the diff is applied to the original source, it comes
> out fine, so maybe it's ok?
> 
> Any advice from expert vimmers would be greatly appreciated.

I think it's just fine.  If you apply it through patch(1) then it will
understand that it's a <TAB> so the result would be what you expect.

Cheers,
-- 
Xin LI <delphij at delphij.net>	http://www.delphij.net/
FreeBSD - The Power to Serve!

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/freebsd-doc/attachments/20071007/0ebbc279/attachment.sig>