Date: Sun, 07 Oct 2007 20:14:07 -0700 From: LI Xin <delphij@delphij.net> To: Chess Griffin <chess@chessgriffin.com> Cc: freebsd-doc@FreeBSD.org Subject: Re: Two space indentation displays incorrectly in diff Message-ID: <4709A07F.1020201@delphij.net> In-Reply-To: <20071007231017.1a29bec8@chessgriffin.com> References: <20071007231017.1a29bec8@chessgriffin.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigAB6DB7749FEF784021E6C907 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Chess Griffin wrote: > Hello, >=20 > 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. >=20 > This is in my .vimrc: >=20 > autocmd BufNewFile,BufRead *.sgml,*.ent,*.html,*.tex,*.xsl set > autoindent formatoptions=3Dtcq2l textwidth=3D70 shiftwidth=3D2 > softtabstop=3D2 tabstop=3D8 >=20 > When I edit the sgml, it looks ok: >=20 > <sect2 id=3D"consoles-vidcontrol"> > <title>Changing Console Video Modes</title> >=20 > <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> >=20 > But in the diff it looks like this: >=20 > + <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> >=20 > It appears that there is only a one space indent after the first <para>= > line. >=20 > I also did ":set list" on the diff and it looks like this: >=20 > + <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>$ >=20 > I am stumped as to why this occurs or how to fix it. =20 >=20 > When the diff is applied to the original source, it comes > out fine, so maybe it's ok? >=20 > 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, --=20 Xin LI <delphij@delphij.net> http://www.delphij.net/ FreeBSD - The Power to Serve! --------------enigAB6DB7749FEF784021E6C907 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFHCaB/OfuToMruuMARCqplAJ9DWk1l20mdrWAPPzb2bzef40vLYACfbVny BB8JS2jsiKIK5XQViTdmfvM= =t922 -----END PGP SIGNATURE----- --------------enigAB6DB7749FEF784021E6C907--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4709A07F.1020201>