From MAILER-DAEMON Fri Mar 18 17:21:21 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Q0h6n-00023M-8x
	for mharc-bug-diffutils@gnu.org; Fri, 18 Mar 2011 17:21:21 -0400
Received: from [140.186.70.92] (port=58074 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q0h6k-000201-Ko
	for bug-diffutils@gnu.org; Fri, 18 Mar 2011 17:21:19 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eblake@redhat.com>) id 1Q0h6j-0008WB-I2
	for bug-diffutils@gnu.org; Fri, 18 Mar 2011 17:21:18 -0400
Received: from qmta13.westchester.pa.mail.comcast.net ([76.96.59.243]:38754)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eblake@redhat.com>) id 1Q0h6j-0008W3-Fw
	for bug-diffutils@gnu.org; Fri, 18 Mar 2011 17:21:17 -0400
Received: from omta21.westchester.pa.mail.comcast.net ([76.96.62.72])
	by qmta13.westchester.pa.mail.comcast.net with comcast
	id Lfuj1g00B1ZXKqc5DlMHzZ; Fri, 18 Mar 2011 21:21:17 +0000
Received: from office.redhat.com ([24.10.251.25])
	by omta21.westchester.pa.mail.comcast.net with comcast
	id LlMD1g00A0ZdyUg3hlMGyQ; Fri, 18 Mar 2011 21:21:17 +0000
From: Eric Blake <eblake@redhat.com>
To: bug-diffutils@gnu.org
Date: Fri, 18 Mar 2011 15:21:11 -0600
Message-Id: <1300483271-18626-1-git-send-email-eblake@redhat.com>
X-Mailer: git-send-email 1.7.4
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
	recognized.
X-Received-From: 76.96.59.243
Subject: [bug-diffutils] [PATCH] docs: diff --help should mention -L
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Mar 2011 21:21:19 -0000

* src/diff.c (option_help_msgid): Document -L.
---

I was surprised to see 'diff -L' in gnulib's maint.mk but no
mention in 'diff --help' to tell me what it did.  I've pushed this:

 src/diff.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/diff.c b/src/diff.c
index 0a25465..6e2a6de 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -860,7 +860,7 @@ static char const * const option_help_msgid[] = {
   "",
   N_("-c  -C NUM  --context[=NUM]  Output NUM (default 3) lines of copied context.\n\
 -u  -U NUM  --unified[=NUM]  Output NUM (default 3) lines of unified context.\n\
-  --label LABEL  Use LABEL instead of file name.\n\
+  -L LABEL  --label=LABEL  Use LABEL instead of file name.\n\
   -p  --show-c-function  Show which C function each change is in.\n\
   -F RE  --show-function-line=RE  Show the most recent line matching RE."),
   N_("-q  --brief  Output only whether files differ."),
-- 
1.7.4



From MAILER-DAEMON Fri Mar 18 17:28:25 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Q0hDd-0006of-Ct
	for mharc-bug-diffutils@gnu.org; Fri, 18 Mar 2011 17:28:25 -0400
Received: from [140.186.70.92] (port=60000 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q0hDZ-0006kT-Kw
	for bug-diffutils@gnu.org; Fri, 18 Mar 2011 17:28:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eblake@redhat.com>) id 1Q0hDY-00016G-Ed
	for bug-diffutils@gnu.org; Fri, 18 Mar 2011 17:28:21 -0400
Received: from mx1.redhat.com ([209.132.183.28]:6104)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eblake@redhat.com>) id 1Q0hDY-000167-5R
	for bug-diffutils@gnu.org; Fri, 18 Mar 2011 17:28:20 -0400
Received: from int-mx12.intmail.prod.int.phx2.redhat.com
	(int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p2ILSJqp002196
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <bug-diffutils@gnu.org>; Fri, 18 Mar 2011 17:28:19 -0400
Received: from [10.3.113.32] (ovpn-113-32.phx2.redhat.com [10.3.113.32])
	by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP
	id p2ILSIfU011831
	for <bug-diffutils@gnu.org>; Fri, 18 Mar 2011 17:28:18 -0400
Message-ID: <4D83CE72.8010306@redhat.com>
Date: Fri, 18 Mar 2011 15:28:18 -0600
From: Eric Blake <eblake@redhat.com>
Organization: Red Hat
User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US;
	rv:1.9.2.13) Gecko/20101209 Fedora/3.1.7-0.35.b3pre.fc14
	Lightning/1.0b3pre Mnenhy/0.8.3 Thunderbird/3.1.7
MIME-Version: 1.0
CC: bug-diffutils@gnu.org
Subject: Re: [bug-diffutils] [PATCH] docs: diff --help should mention -L
References: <1300483271-18626-1-git-send-email-eblake@redhat.com>
In-Reply-To: <1300483271-18626-1-git-send-email-eblake@redhat.com>
X-Enigmail-Version: 1.1.2
OpenPGP: url=http://people.redhat.com/eblake/eblake.gpg
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature";
	boundary="------------enig83483BDD77CB06C380D126BD"
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
	recognized.
X-Received-From: 209.132.183.28
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Mar 2011 21:28:24 -0000

This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enig83483BDD77CB06C380D126BD
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

On 03/18/2011 03:21 PM, Eric Blake wrote:
> * src/diff.c (option_help_msgid): Document -L.
> ---
>=20
> I was surprised to see 'diff -L' in gnulib's maint.mk but no
> mention in 'diff --help' to tell me what it did.  I've pushed this:

And five seconds after pushing, I realized the info file needs the same f=
ix.

diff --git a/doc/diff.texi b/doc/diff.texi
index 4617aee..b9e23dc 100644
--- a/doc/diff.texi
+++ b/doc/diff.texi
@@ -3814,7 +3814,8 @@ Ignore case when comparing file names during
recursive comparison.
 @itemx --paginate
 Pass the output through @command{pr} to paginate it.  @xref{Pagination}.=


-@item --label=3D@var{label}
+@item -L @var{label}
+@itemx --label=3D@var{label}
 Use @var{label} instead of the file name in the context format
 (@pxref{Context Format}) and unified format (@pxref{Unified Format})
 headers.  @xref{RCS}.
--=20
1.7.4



--=20
Eric Blake   eblake@redhat.com    +1-801-349-2682
Libvirt virtualization library http://libvirt.org


--------------enig83483BDD77CB06C380D126BD
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.11 (GNU/Linux)
Comment: Public key at http://people.redhat.com/eblake/eblake.gpg
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/

iQEcBAEBCAAGBQJNg85yAAoJEKeha0olJ0NqeyMIAKbX7tASq6nLoIGnOeBiAi41
NXjVgdIHkDBkMn6OSiF1JIpn+FDGYZL9zc5jacQ8RdouBX+epFg5gBodTTuS9kTD
vj11yszeE2o30GpSabZBBxmreq/mpsunOD3FyVW46n6Q4pkRHz5IlaNuphoOX8+e
QarHgXW4XBLzstnk6NZn2j2ICM0BsPu+WQBgaX1XWC/eY2hDsFXbkvEaVf9g/f+X
4qoG/IOJBgRtqbiCruCfcdUsn9DCl3MQFdHTUL9p5UAhSQ12uPVjRyqiZUrqBO47
Iy7XVEtXi4EkCvM2zxFeCW5PmQWfLi3tzlAsARy8dxCy0AiuxHVViN9nGRCQLIs=
=ognW
-----END PGP SIGNATURE-----

--------------enig83483BDD77CB06C380D126BD--


From MAILER-DAEMON Fri Mar 18 17:45:11 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Q0hTr-0003Ur-8M
	for mharc-bug-diffutils@gnu.org; Fri, 18 Mar 2011 17:45:11 -0400
Received: from [140.186.70.92] (port=42049 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q0hTo-0003Ui-UF
	for bug-diffutils@gnu.org; Fri, 18 Mar 2011 17:45:09 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1Q0hTn-0004E6-FB
	for bug-diffutils@gnu.org; Fri, 18 Mar 2011 17:45:08 -0400
Received: from mx.meyering.net ([82.230.74.64]:40236)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1Q0hTn-0004Ds-3H
	for bug-diffutils@gnu.org; Fri, 18 Mar 2011 17:45:07 -0400
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id 699EB600D2; Fri, 18 Mar 2011 22:45:05 +0100 (CET)
From: Jim Meyering <jim@meyering.net>
To: jidanni@jidanni.org
In-Reply-To: <87r5b38o5b.fsf@jidanni.org> (jidanni@jidanni.org's message of
	"Sun, 20 Feb 2011 09:56:16 +0800")
References: <AANLkTinm5Zsq6cG9F3zCq0=nsZ81QLqSmUbx7KPsxk9f@mail.gmail.com>
	<87r5b38o5b.fsf@jidanni.org>
Date: Fri, 18 Mar 2011 22:45:05 +0100
Message-ID: <87ipvgyufy.fsf@rho.meyering.net>
Lines: 59
MIME-Version: 1.0
Content-Type: text/plain
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 82.230.74.64
Cc: wikitech-l@lists.wikimedia.org, bug-diffutils@gnu.org
Subject: [bug-diffutils] Re: stop changing the whitespace in RELEASE-NOTES
	please
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Mar 2011 21:45:09 -0000

jidanni@jidanni.org wrote:
> One wishes the diff man page would say SEE ALSO wdiff(1), and
> visa-versa, lest I go every stupidly writing my own program again.

Good idea.
Now diff.1 does say SEE ALSO wdiff(1):

>From be5181ff3f322f0fb73a0bf67369f9b3c427bd2d Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Fri, 18 Mar 2011 22:38:59 +0100
Subject: [PATCH] doc: add a reference to wdiff(1) from diff.1

* man/diff.x: New file, to add "SEE ALSO" reference to wdiff(1).
* man/Makefile.am (diff.1): Depend on diff.x.
($(dist_man1_MANS)): Tell help2man to include diff.x.
(EXTRA_DIST): Add diff.x.
Suggestion from Dan Jacobson in http://bugs.debian.org/613319
---
 man/Makefile.am |    9 ++++++---
 man/diff.x      |    2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 man/diff.x

diff --git a/man/Makefile.am b/man/Makefile.am
index 597572b..d3cff23 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -18,9 +18,11 @@
 dist_man1_MANS = cmp.1 diff.1 diff3.1 sdiff.1
 MAINTAINERCLEANFILES = $(dist_man1_MANS)

+EXTRA_DIST = diff.x
+
 S = $(top_srcdir)/src
 cmp.1: $S/cmp.c
-diff.1: $S/diff.c
+diff.1: $S/diff.c diff.x
 diff3.1: $S/diff3.c
 sdiff.1: $S/sdiff.c

@@ -28,5 +30,6 @@ sdiff.1: $S/sdiff.c
 $(dist_man1_MANS): $(top_srcdir)/configure.ac
 	$(AM_V_GEN)base=`expr $@ : '\(.*\).1'` && \
 	  (echo '[NAME]' && sed 's@/\* *@@; s/-/\\-/; q' $S/$$base.c) | \
-	  $(HELP2MAN) -i - -S '$(PACKAGE) $(VERSION)' ../src/$$base | \
-	  sed 's/^\.B info .*/.B info diff/' >$@
+	  $(HELP2MAN) -i - -i $(srcdir)/$$base.x -S '$(PACKAGE) $(VERSION)' \
+                ../src/$$base \
+            | sed 's/^\.B info .*/.B info diff/' >$@
diff --git a/man/diff.x b/man/diff.x
new file mode 100644
index 0000000..52e605c
--- /dev/null
+++ b/man/diff.x
@@ -0,0 +1,2 @@
+[SEE ALSO]
+wdiff(1)
--
1.7.4.1.494.g5ddab


From MAILER-DAEMON Wed Mar 23 14:04:40 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Q2SQC-0000r2-AB
	for mharc-bug-diffutils@gnu.org; Wed, 23 Mar 2011 14:04:40 -0400
Received: from [140.186.70.92] (port=44754 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q2Qyt-00049m-Tt
	for bug-diffutils@gnu.org; Wed, 23 Mar 2011 12:32:25 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <michael.ch.brand@gmail.com>) id 1Q2Qys-0003r1-Vl
	for bug-diffutils@gnu.org; Wed, 23 Mar 2011 12:32:23 -0400
Received: from mail-iw0-f169.google.com ([209.85.214.169]:48203)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <michael.ch.brand@gmail.com>) id 1Q2Qys-0003qd-SW
	for bug-diffutils@gnu.org; Wed, 23 Mar 2011 12:32:22 -0400
Received: by iwl42 with SMTP id 42so11424706iwl.0
	for <bug-diffutils@gnu.org>; Wed, 23 Mar 2011 09:32:21 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:mime-version:date:message-id:subject:from:to
	:content-type; bh=g+2ETkxhkS2yIXTlqMvuNYcPeXocOyiMP019/21oHFs=;
	b=BJoP5PC4G25dflAFEhPxcCbtbGB5G2H1o2yqwk5sE4c+UqWASsCtL7iVuO5qijPHes
	b3oLjbV1pobJ0q+SebfSPvfJXj4Tv84PA6gPNHEhg1RfNPlQyE8umjWiTPLNUW+PFDXX
	KvlEzTFYdAMAK3ChbM2RbOICLgkaTR5WLKt4I=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=mime-version:date:message-id:subject:from:to:content-type;
	b=T8p8XEhfdPko7jJNGG8dU2ofxIX2otoejneOYDUkhUIb9DVkyqPrj0g8o95ovOp5pK
	7v8sRNsY1SFDO9rQshtApO19/YTqCB1eKhUaxGrKT8L7F9+DnmDjFYL0pzm9cyVwwDmW
	G2DSWj+A3tuYHtm5eU/NTEpdMYcPN0N0bq048=
MIME-Version: 1.0
Received: by 10.231.204.16 with SMTP id fk16mr6981962ibb.49.1300897941561;
	Wed, 23 Mar 2011 09:32:21 -0700 (PDT)
Received: by 10.231.169.66 with HTTP; Wed, 23 Mar 2011 09:32:21 -0700 (PDT)
Date: Wed, 23 Mar 2011 17:32:21 +0100
Message-ID: <AANLkTimW3J1NdNh4ymisvfGWrhh7FoFhZbrfxRjbQz2N@mail.gmail.com>
From: Michael Brand <michael.ch.brand@gmail.com>
To: bug-diffutils@gnu.org
Content-Type: multipart/mixed; boundary=0016e68df37ab220d0049f28e7cf
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 209.85.214.169
X-Mailman-Approved-At: Wed, 23 Mar 2011 14:04:38 -0400
Subject: [bug-diffutils] diff: ignore empty lines during *alignment* of
	lines?
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Mar 2011 16:32:25 -0000

--0016e68df37ab220d0049f28e7cf
Content-Type: text/plain; charset=ISO-8859-1

Hi all

Is there a way to tell diff to not use any empty line, that occurs in
both files, for alignment of the lines from both files? I tried `diff
--side-by-side --width=28 diff1.txt diff2.txt' of diffutils 3.0 with
various options and get always:

----------------
a               a
{               {
    aa1      |      aa2
}            <

b            |      aa2
{            <
    bb1      <
}               }

y            |  b
{               {
    yy       |      bb2
}               }
----------------

but would like to get:

----------------
a               a
{               {
    aa1      |      aa2
             >
             >      aa2
}               }

b               b
{               {
    bb1      |      bb2
}            <
             <
y            <
{            <
    yy       <
}               }
----------------

just similar to what I can get already now if I remove all empty lines
in the input files, shown in this output:

----------------
a               a
{               {
    aa1      |      aa2
             >      aa2
}               }
b               b
{               {
    bb1      |      bb2
}            <
y            <
{            <
    yy       <
}               }
----------------

I tried to find out myself but always only found hints like
`--ignore-blank-lines' which do not help in my case. Removing the
empty lines in the input is not really helpful because I would like to
use the diff output to patch the original files or as an input for an
editor which allows to edit the original files shown together with the
highlighted differences.

Please reply to me too because I am not subscribed to the list.

Michael

--0016e68df37ab220d0049f28e7cf
Content-Type: text/plain; charset=US-ASCII; name="diff1.txt"
Content-Disposition: attachment; filename="diff1.txt"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_glmgv8so0

YQp7CiAgICBhYTEKfQoKYgp7CiAgICBiYjEKfQoKeQp7CiAgICB5eQp9Cg==
--0016e68df37ab220d0049f28e7cf
Content-Type: text/plain; charset=US-ASCII; name="diff2.txt"
Content-Disposition: attachment; filename="diff2.txt"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_glmgy0ro1

YQp7CiAgICBhYTIKCiAgICBhYTIKfQoKYgp7CiAgICBiYjIKfQo=
--0016e68df37ab220d0049f28e7cf--


From MAILER-DAEMON Sat Mar 26 08:45:22 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Q3Srq-0004DF-P2
	for mharc-bug-diffutils@gnu.org; Sat, 26 Mar 2011 08:45:22 -0400
Received: from [140.186.70.92] (port=41826 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q3Sro-0004D8-GS
	for bug-diffutils@gnu.org; Sat, 26 Mar 2011 08:45:21 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1Q3Srn-00049V-HZ
	for bug-diffutils@gnu.org; Sat, 26 Mar 2011 08:45:20 -0400
Received: from mx.meyering.net ([82.230.74.64]:37052)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1Q3Srn-000490-BX
	for bug-diffutils@gnu.org; Sat, 26 Mar 2011 08:45:19 -0400
Received: by rho.meyering.net (Acme Bit-Twister, from userid 1000)
	id B436C601C0; Sat, 26 Mar 2011 13:45:16 +0100 (CET)
From: Jim Meyering <jim@meyering.net>
To: bug-diffutils@gnu.org
Date: Sat, 26 Mar 2011 13:45:16 +0100
Message-ID: <877hbmf3tv.fsf@rho.meyering.net>
Lines: 58
MIME-Version: 1.0
Content-Type: text/plain
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
	recognized.
X-Received-From: 82.230.74.64
Subject: [bug-diffutils] .x-sc_space_tab: Remove file.  Instead, ...
X-BeenThere: bug-diffutils@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "All diffutils discussion." <bug-diffutils.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/bug-diffutils>
List-Post: <mailto:bug-diffutils@gnu.org>
List-Help: <mailto:bug-diffutils-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/bug-diffutils>,
	<mailto:bug-diffutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Mar 2011 12:45:21 -0000

FYI,

>From d9d3cf9f096df7c11c4453b8453f53eda53939fa Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Sat, 26 Mar 2011 12:46:26 +0100
Subject: [PATCH 1/2] maint: fix typo in unused rule

* cfg.mk (config-save): Fix typo: add leading "_" in variable name.
---
 cfg.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index 741c51f..bdaa631 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -62,5 +62,5 @@ config-save:
 	$(MAKE) --quiet config-compare > /dev/null 2>&1 \
 	  && { echo no change; exit 1; } || :
 	mkdir -p $(_cf_state_dir)/$(_date_time)
-	ln -nsf $(date_time) $(_cf_state_dir)/latest
+	ln -nsf $(_date_time) $(_cf_state_dir)/latest
 	cp lib/config.h config.status $(_cf_state_dir)/latest
--
1.7.4.1.688.g95e3e


>From 8a223056984c0153638e33e074cf334a32b3fd97 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Sat, 26 Mar 2011 13:44:13 +0100
Subject: [PATCH 2/2] * .x-sc_space_tab: Remove file.  Instead, ...

* cfg.mk (exclude_file_name_regexp--sc_space_tab): ...define this.
---
 .x-sc_space_tab |    1 -
 cfg.mk          |    2 ++
 2 files changed, 2 insertions(+), 1 deletions(-)
 delete mode 100644 .x-sc_space_tab

diff --git a/.x-sc_space_tab b/.x-sc_space_tab
deleted file mode 100644
index 0c887f2..0000000
--- a/.x-sc_space_tab
+++ /dev/null
@@ -1 +0,0 @@
-^gl/lib/.*\.c\.diff$
diff --git a/cfg.mk b/cfg.mk
index bdaa631..45f52e0 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -64,3 +64,5 @@ config-save:
 	mkdir -p $(_cf_state_dir)/$(_date_time)
 	ln -nsf $(_date_time) $(_cf_state_dir)/latest
 	cp lib/config.h config.status $(_cf_state_dir)/latest
+
+exclude_file_name_regexp--sc_space_tab = ^gl/lib/.*\.c\.diff$$
--
1.7.4.1.688.g95e3e


