From owner-freebsd-doc@FreeBSD.ORG Mon Oct 8 03:34:34 2007 Return-Path: Delivered-To: freebsd-doc@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8156B16A41B for ; Mon, 8 Oct 2007 03:34:34 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from tarsier.geekcn.org (tarsier.geekcn.org [210.51.165.229]) by mx1.freebsd.org (Postfix) with ESMTP id 01FFF13C4BD for ; Mon, 8 Oct 2007 03:34:33 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from localhost (tarsier.geekcn.org [210.51.165.229]) by tarsier.geekcn.org (Postfix) with ESMTP id 62547EB4F7D; Mon, 8 Oct 2007 11:14:34 +0800 (CST) X-Virus-Scanned: amavisd-new at geekcn.org Received: from tarsier.geekcn.org ([210.51.165.229]) by localhost (mail.geekcn.org [210.51.165.229]) (amavisd-new, port 10024) with ESMTP id SuiqSs4V+pSC; Mon, 8 Oct 2007 11:14:23 +0800 (CST) Received: from LI-Xins-MacBook.local (c-67-161-39-180.hsd1.ca.comcast.net [67.161.39.180]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tarsier.geekcn.org (Postfix) with ESMTP id A0526EB3415; Mon, 8 Oct 2007 11:14:21 +0800 (CST) DomainKey-Signature: a=rsa-sha1; s=default; d=delphij.net; c=nofws; q=dns; h=message-id:date:from:reply-to:organization:user-agent: mime-version:to:cc:subject:references:in-reply-to: x-enigmail-version:openpgp:content-type; b=WK2foG5iNhnEDKkPd0AEExvm35ehe65mwV8yrJhOZGadcyiL/DHxhpMZgXqPwrviC iG31MBoR696gPgEuIkH5A== Message-ID: <4709A07F.1020201@delphij.net> Date: Sun, 07 Oct 2007 20:14:07 -0700 From: LI Xin Organization: The FreeBSD Project User-Agent: Thunderbird 2.0.0.6 (Macintosh/20070728) MIME-Version: 1.0 To: Chess Griffin References: <20071007231017.1a29bec8@chessgriffin.com> In-Reply-To: <20071007231017.1a29bec8@chessgriffin.com> X-Enigmail-Version: 0.95.3 OpenPGP: url=http://www.delphij.net/delphij.asc Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="------------enigAB6DB7749FEF784021E6C907" Cc: freebsd-doc@FreeBSD.org Subject: Re: Two space indentation displays incorrectly in diff X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: d@delphij.net List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Oct 2007 03:34:34 -0000 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 , 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 > > Changing Console Video Modes >=20 > 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: >=20 > But in the diff it looks like this: >=20 > + > + Changing Console Video Modes > + > + 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: >=20 > It appears that there is only a one space indent after the first = > line. >=20 > I also did ":set list" on the diff and it looks like this: >=20 > + $ > + Changing Console Video Modes$ > +$ > + 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:$ >=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 so the result would be what you expect. Cheers, --=20 Xin LI 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--