Two space indentation displays incorrectly in diff
--Sig_/AhGaVD/_ocWdkcAjzzhZ4FG
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
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=20
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=3Dtcq2l textwidth=3D70 shiftwidth=3D2
softtabstop=3D2 tabstop=3D8
When I edit the sgml, it looks ok:
<sect2 id=3D"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=20
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=3D"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=3D"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. =20
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.
Thank you.
Chess
--=20
Chess Griffin
GPG Public Key: 0x0C7558C3
http://www.chessgriffin.com
--Sig_/AhGaVD/_ocWdkcAjzzhZ4FG
Content-Type: application/pgp-signature; name=signature.asc
Content-Disposition: attachment; filename=signature.asc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (FreeBSD)
iD8DBQFHCZ+ZKzd9mAx1WMMRAuQGAJ4hPSN5MlvEnNNf6OECIclaB6QW7ACfeoe4
V4pSvDgJsiNlossH9BNY2XY=
=m4CE
-----END PGP SIGNATURE-----
--Sig_/AhGaVD/_ocWdkcAjzzhZ4FG--
討論串 (同標題文章)
完整討論串 (本文為第 1 之 6 篇)：