From owner-freebsd-doc@FreeBSD.ORG Mon Oct 8 04:38: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 289D716A419 for ; Mon, 8 Oct 2007 04:38:34 +0000 (UTC) (envelope-from brdbrd@gmail.com) Received: from rv-out-0910.google.com (rv-out-0910.google.com [209.85.198.186]) by mx1.freebsd.org (Postfix) with ESMTP id E4A5E13C4BB for ; Mon, 8 Oct 2007 04:38:33 +0000 (UTC) (envelope-from brdbrd@gmail.com) Received: by rv-out-0910.google.com with SMTP id l15so574852rvb for ; Sun, 07 Oct 2007 21:38:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:sender:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; bh=KwO3bsPeQ6fPl5Nu0DbRTljB1c+UVomjrNzMgFjdpaQ=; b=k46ELUcuAIKrZw+MozhvIsiVXREALtltdwmrUbAk3L+949WsJlBQnq1C+9UwLguvAn8LNVsgdJg3QQLHh0bERUjO0TuZJ2hxMVpym74rntAOxkaPgsVx6TWeYrUmn2jyfZhqoGQVgqizYRYLukn/fr5gZbczCltMlC7aR++tOdU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:sender:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth; b=grQQlMOZPgrG672HWQkIswEpVbu2YSWW8n8amh5cIRTQ0xPBirv5GNr/H6SjgJaKKxiNJh/JgojV9DvabmAkvE/jfgxrn9PAK5pqJzRG0sz8YREhC0ZiuUB0Y78T3TgzEK/vq7jVwzsFi/Iv4Kl9589HH+8prMdkE9YM3AxOU5g= Received: by 10.141.34.12 with SMTP id m12mr238510rvj.1191816862022; Sun, 07 Oct 2007 21:14:22 -0700 (PDT) Received: by 10.141.36.7 with HTTP; Sun, 7 Oct 2007 21:14:21 -0700 (PDT) Message-ID: <35ffa5710710072114v17f419c7p74b8c5045dff6e19@mail.gmail.com> Date: Sun, 7 Oct 2007 22:14:22 -0600 From: "Brad Davis" Sender: brdbrd@gmail.com To: freebsd-doc@freebsd.org, "Chess Griffin" In-Reply-To: <200710080541.34050.max@love2party.net> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <20071007231017.1a29bec8@chessgriffin.com> <200710080541.34050.max@love2party.net> X-Google-Sender-Auth: 026ecdb3773bdf5e Cc: Subject: Re: Two space indentation displays incorrectly in diff X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Oct 2007 04:38:34 -0000 On 10/7/07, Max Laier wrote: > On Monday 08 October 2007, 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 , 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: > > > > > > 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: > > > > But in the diff it looks like this: > > > > + > > + 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: > > > > It appears that there is only a one space indent after the first > > line. > > > > I also did ":set list" on the diff and it looks like this: > > > > + $ > > + 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:$ > > > > I am stumped as to why this occurs or how to fix it. > > Obviously vim in converting the 8 spaces into one tab. When displayed > this turns into "indentation to the first tabstop (=8)" which means only > and indentation of 7 is visible (deducting the plus sign). > > I don't know how to teach vim not to do the conversion and I don't know if > that might even be the right formatting, but I hope this helps. > > > 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. Try this: " When off, a always inserts blanks according to 'tabstop'. set nosmarttab Regards, Brad Davis