From MAILER-DAEMON Thu Jun 09 18:16:16 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DgVJw-0005BS-Bz
	for mharc-grep-commit@gnu.org; Thu, 09 Jun 2005 18:16:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DgVJt-0005Av-S3
	for grep-commit@gnu.org; Thu, 09 Jun 2005 18:16:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DgVJr-00059p-OE
	for grep-commit@gnu.org; Thu, 09 Jun 2005 18:16:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DgVJr-00059K-IQ
	for grep-commit@gnu.org; Thu, 09 Jun 2005 18:16:11 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DgVFK-0002I3-Pf
	for grep-commit@gnu.org; Thu, 09 Jun 2005 18:11:30 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DgVEy-0004OF-Ec
	for grep-cvs-diffs@gnu.org; Thu, 09 Jun 2005 18:11:08 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DgVFJ-0002Hq-GK
	for grep-cvs-diffs@gnu.org; Thu, 09 Jun 2005 18:11:29 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DgVFJ-0002Hm-Cl
	for grep-cvs-diffs@gnu.org; Thu, 09 Jun 2005 18:11:29 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DgVF4-0000cK-00
	for <grep-cvs-diffs@gnu.org>; Thu, 09 Jun 2005 18:11:14 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DgVF4-0000cK-00@savannah.gnu.org>
Date: Thu, 09 Jun 2005 18:11:14 -0400
Cc: 
Subject: Changes to grep/README-alpha
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Jun 2005 22:16:14 -0000

Index: grep/README-alpha
diff -u grep/README-alpha:1.9 grep/README-alpha:1.10
--- grep/README-alpha:1.9	Fri May  6 00:21:24 2005
+++ grep/README-alpha	Thu Jun  9 22:11:13 2005
@@ -16,3 +16,6 @@
 email message to <grep-commit-request@gnu.org> with "subscribe" (without
 the quotation marks) in the subject header field (or in the body) of
 the email, or visit <http://lists.gnu.org/mailman/listinfo/grep-commit>.
+
+A web page containing information for GNU grep developers is also
+available at <http://www.gnu.org/software/grep/devel.html>.



From MAILER-DAEMON Thu Jun 09 18:32:27 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DgVZX-0001az-MU
	for mharc-grep-commit@gnu.org; Thu, 09 Jun 2005 18:32:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DgVZR-0001WV-3s
	for grep-commit@gnu.org; Thu, 09 Jun 2005 18:32:17 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DgVZO-0001V9-M5
	for grep-commit@gnu.org; Thu, 09 Jun 2005 18:32:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DgVZO-0001Tz-AB
	for grep-commit@gnu.org; Thu, 09 Jun 2005 18:32:14 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DgVWW-0003qd-HB
	for grep-commit@gnu.org; Thu, 09 Jun 2005 18:29:16 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DgVW9-0004cv-Th
	for grep-cvs-logs@gnu.org; Thu, 09 Jun 2005 18:28:53 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DgVUt-0003lv-KT
	for grep-cvs-logs@gnu.org; Thu, 09 Jun 2005 18:27:36 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DgVUt-0003ls-Ej
	for grep-cvs-logs@gnu.org; Thu, 09 Jun 2005 18:27:35 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DgVF4-0000cN-00
	for <grep-cvs-logs@gnu.org>; Thu, 09 Jun 2005 18:11:14 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DgVF4-0000cN-00@savannah.gnu.org>
Date: Thu, 09 Jun 2005 18:11:14 -0400
Cc: 
Subject: grep README-alpha
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Jun 2005 22:32:20 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/06/09 22:11:13

Modified files:
	.              : README-alpha 

Log message:
	Added pointer to devel web page to grep/README-alpha.
	This is an excuse to test whether logs and diffs to the webcvs tree find
	their way to the grep-commit mailing list.
	If the email messages for _this_ change to the cvsroot tree make it first,
	we'll know it still doesn't work.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/README-alpha.diff?tr1=1.9&tr2=1.10&r1=text&r2=text




From MAILER-DAEMON Thu Jun 09 20:52:23 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DgXl0-00029P-Vc
	for mharc-grep-commit@gnu.org; Thu, 09 Jun 2005 20:52:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DgUl9-0000qX-2g
	for grep-commit@gnu.org; Thu, 09 Jun 2005 17:40:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DgUl4-0000nv-KI
	for grep-commit@gnu.org; Thu, 09 Jun 2005 17:40:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DgUl4-0000n3-FP
	for grep-commit@gnu.org; Thu, 09 Jun 2005 17:40:14 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DgUhn-00088y-QX
	for grep-commit@gnu.org; Thu, 09 Jun 2005 17:36:51 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DgUhR-0003qT-U5
	for grep-webcvs-diffs@gnu.org; Thu, 09 Jun 2005 17:36:29 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DgUfz-000801-2p
	for grep-webcvs-diffs@gnu.org; Thu, 09 Jun 2005 17:34:59 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DgUfy-0007zu-Ut
	for grep-webcvs-diffs@gnu.org; Thu, 09 Jun 2005 17:34:59 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DgUfi-0004v0-00
	for <grep-webcvs-diffs@gnu.org>; Thu, 09 Jun 2005 17:34:42 -0400
To: grep-webcvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DgUfi-0004v0-00@savannah.gnu.org>
Date: Thu, 09 Jun 2005 17:34:42 -0400
X-Mailman-Approved-At: Thu, 09 Jun 2005 20:52:22 -0400
Cc: 
Subject: Changes to grep/devel.html
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Jun 2005 21:40:20 -0000

Index: grep/devel.html
diff -u grep/devel.html:1.2 grep/devel.html:1.3
--- grep/devel.html:1.2	Sat Jun  4 19:30:23 2005
+++ grep/devel.html	Thu Jun  9 21:34:42 2005
@@ -315,7 +315,7 @@
 </pre
     ><p
       >(The <tt>grep-commit</tt> mailing list functionality for this tree
-       does not seem to be working at this time.)<p
+       should now work thanks to Savannah sr #103962.)<p
 
     ><h3
       >4.3&nbsp; Tools</h3
@@ -1491,7 +1491,7 @@
          provided this notice and the copyright notice are preserved.</p
       ><p
         >Updated: <tt
-          >$Date: 2005/06/04 19:30:23 $</tt
+          >$Date: 2005/06/09 21:34:42 $</tt
         > (UTC) by <tt
           >$Author: charles_levert $</tt
         > (at <tt>savannah.gnu.org</tt>)</p



From MAILER-DAEMON Thu Jun 09 20:52:23 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DgXl1-00029U-2n
	for mharc-grep-commit@gnu.org; Thu, 09 Jun 2005 20:52:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DgV3k-00080N-NZ
	for grep-commit@gnu.org; Thu, 09 Jun 2005 17:59:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DgV3i-0007yv-Mj
	for grep-commit@gnu.org; Thu, 09 Jun 2005 17:59:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DgV3i-0007yd-FH
	for grep-commit@gnu.org; Thu, 09 Jun 2005 17:59:30 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DgV0y-00018C-GC
	for grep-commit@gnu.org; Thu, 09 Jun 2005 17:56:40 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DgV0c-0004B2-Bk
	for grep-webcvs-logs@gnu.org; Thu, 09 Jun 2005 17:56:18 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DgUx3-0000nb-M7
	for grep-webcvs-logs@gnu.org; Thu, 09 Jun 2005 17:52:38 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DgUx3-0000mS-Cv
	for grep-webcvs-logs@gnu.org; Thu, 09 Jun 2005 17:52:37 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DgUfj-0004v4-00
	for <grep-webcvs-logs@gnu.org>; Thu, 09 Jun 2005 17:34:43 -0400
To: grep-webcvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DgUfj-0004v4-00@savannah.gnu.org>
Date: Thu, 09 Jun 2005 17:34:43 -0400
X-Mailman-Approved-At: Thu, 09 Jun 2005 20:52:22 -0400
Cc: 
Subject: grep devel.html
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Jun 2005 21:59:35 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/06/09 21:34:42

Modified files:
	.              : devel.html 

Log message:
	The grep-commit mailing list functionality for the webcvs tree
	should now work thanks to Savannah sr #103962 and sr #104288.
	This tries it out.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/devel.html.diff?tr1=1.2&tr2=1.3&r1=text&r2=text




From MAILER-DAEMON Tue Jun 14 17:00:17 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DiIW9-0002fk-1f
	for mharc-grep-commit@gnu.org; Tue, 14 Jun 2005 17:00:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DiIW6-0002f4-Cx
	for grep-commit@gnu.org; Tue, 14 Jun 2005 17:00:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DiIVz-0002cj-4X
	for grep-commit@gnu.org; Tue, 14 Jun 2005 17:00:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DiIVy-0002c8-Jm
	for grep-commit@gnu.org; Tue, 14 Jun 2005 17:00:06 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DiIUI-0007Im-0X
	for grep-commit@gnu.org; Tue, 14 Jun 2005 16:58:22 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DiISu-0006gE-TI
	for grep-cvs-diffs@gnu.org; Tue, 14 Jun 2005 16:56:56 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DiIU6-0007HC-BL
	for grep-cvs-diffs@gnu.org; Tue, 14 Jun 2005 16:58:10 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DiIU6-0007GL-3o
	for grep-cvs-diffs@gnu.org; Tue, 14 Jun 2005 16:58:10 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DiISh-0007Ev-00
	for <grep-cvs-diffs@gnu.org>; Tue, 14 Jun 2005 16:56:43 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DiISh-0007Ev-00@savannah.gnu.org>
Date: Tue, 14 Jun 2005 16:56:43 -0400
Cc: 
Subject: Changes to grep/tests/foad1.sh
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jun 2005 21:00:14 -0000

Index: grep/tests/foad1.sh
diff -u grep/tests/foad1.sh:1.7 grep/tests/foad1.sh:1.8
--- grep/tests/foad1.sh:1.7	Fri Apr 29 11:30:09 2005
+++ grep/tests/foad1.sh	Tue Jun 14 20:56:42 2005
@@ -51,8 +51,8 @@
 
 # Test "--color" option
 
-CB="[01;31m"
-CE="[00m"
+CB="[01;31m[K"
+CE="[m[K"
 
 # "--color" with "-i" should output an exact copy of the matching input text.
 grep_test "WordA/wordb/WORDC/" "${CB}Word${CE}A/${CB}word${CE}b/${CB}WORD${CE}C/" "Word" --color=always -i



From MAILER-DAEMON Tue Jun 14 17:00:17 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DiIW9-0002fs-8I
	for mharc-grep-commit@gnu.org; Tue, 14 Jun 2005 17:00:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DiIW5-0002ev-WE
	for grep-commit@gnu.org; Tue, 14 Jun 2005 17:00:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DiIVz-0002ca-29
	for grep-commit@gnu.org; Tue, 14 Jun 2005 17:00:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DiIVy-0002c8-PZ
	for grep-commit@gnu.org; Tue, 14 Jun 2005 17:00:06 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DiIUH-0007Ie-P6
	for grep-commit@gnu.org; Tue, 14 Jun 2005 16:58:21 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DiISu-0006gE-L6
	for grep-cvs-diffs@gnu.org; Tue, 14 Jun 2005 16:56:56 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DiIU6-0007HP-Je
	for grep-cvs-diffs@gnu.org; Tue, 14 Jun 2005 16:58:11 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DiIU6-0007GL-DN
	for grep-cvs-diffs@gnu.org; Tue, 14 Jun 2005 16:58:10 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DiISh-0007Ep-00
	for <grep-cvs-diffs@gnu.org>; Tue, 14 Jun 2005 16:56:43 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DiISh-0007Ep-00@savannah.gnu.org>
Date: Tue, 14 Jun 2005 16:56:43 -0400
Cc: 
Subject: Changes to grep/tests/fmbtest.sh
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jun 2005 21:00:14 -0000

Index: grep/tests/fmbtest.sh
diff -u grep/tests/fmbtest.sh:1.1 grep/tests/fmbtest.sh:1.2
--- grep/tests/fmbtest.sh:1.1	Wed Apr 27 20:30:53 2005
+++ grep/tests/fmbtest.sh	Tue Jun 14 20:56:42 2005
@@ -70,7 +70,7 @@
 # Test that -F --color=always prefers longer matches.
 test5="`echo 'Cosi tu ČišÍ...' \
 	| LC_ALL=cs_CZ.UTF-8 ${GREP} --color=always -Fi -e 'čiš' -e 'čiší'`"
-if echo "$test5" | LC_ALL=C ${GREP} -q 'Cosi tu .*\[.*mČišÍ.*\[.*m\(.\[K\)\?\.\.\.'; then
+if echo "$test5" | LC_ALL=C ${GREP} -q 'Cosi tu .*\[.*m\(.\[K\)\?ČišÍ.*\[.*m\(.\[K\)\?\.\.\.'; then
   :
 else
   echo "Test #5 F failed: $test5"
@@ -82,7 +82,7 @@
 # Test that -{G,E} --color=always prefers earlier pattern matches.
 test6="`echo 'Cosi tu ČišÍ...' \
 	| LC_ALL=cs_CZ.UTF-8 ${GREP} --color=always -${mode}i -e 'čiš' -e 'čiší'`"
-if echo "$test6" | LC_ALL=C ${GREP} -q 'Cosi tu .*\[.*mČiš.*\[.*m\(.\[K\)\?Í\.\.\.'; then
+if echo "$test6" | LC_ALL=C ${GREP} -q 'Cosi tu .*\[.*m\(.\[K\)\?Čiš.*\[.*m\(.\[K\)\?Í\.\.\.'; then
   :
 else
   echo "Test #6 ${mode} failed: $test6"
@@ -92,7 +92,7 @@
 # Test that -{G,E} --color=always prefers earlier pattern matches.
 test7="`echo 'Cosi tu ČišÍ...' \
 	| LC_ALL=cs_CZ.UTF-8 ${GREP} --color=always -${mode}i -e 'čiší' -e 'čiš'`"
-if echo "$test7" | LC_ALL=C ${GREP} -q 'Cosi tu .*\[.*mČišÍ.*\[.*m\(.\[K\)\?\.\.\.'; then
+if echo "$test7" | LC_ALL=C ${GREP} -q 'Cosi tu .*\[.*m\(.\[K\)\?ČišÍ.*\[.*m\(.\[K\)\?\.\.\.'; then
   :
 else
   echo "Test #7 ${mode} failed: $test7"



From MAILER-DAEMON Tue Jun 14 17:00:18 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DiIWA-0002gh-FI
	for mharc-grep-commit@gnu.org; Tue, 14 Jun 2005 17:00:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DiIW6-0002fJ-R5
	for grep-commit@gnu.org; Tue, 14 Jun 2005 17:00:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DiIW0-0002co-2c
	for grep-commit@gnu.org; Tue, 14 Jun 2005 17:00:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DiIVy-0002c8-Tj
	for grep-commit@gnu.org; Tue, 14 Jun 2005 17:00:06 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DiIU6-0007HW-MN
	for grep-commit@gnu.org; Tue, 14 Jun 2005 16:58:10 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DiISj-0006gE-Ib
	for grep-cvs-logs@gnu.org; Tue, 14 Jun 2005 16:56:45 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DiIU5-0007Gv-RM
	for grep-cvs-logs@gnu.org; Tue, 14 Jun 2005 16:58:10 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DiIU5-0007GL-L2
	for grep-cvs-logs@gnu.org; Tue, 14 Jun 2005 16:58:09 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DiISh-0007F3-00
	for <grep-cvs-logs@gnu.org>; Tue, 14 Jun 2005 16:56:43 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DiISh-0007F3-00@savannah.gnu.org>
Date: Tue, 14 Jun 2005 16:56:43 -0400
Cc: 
Subject: grep ./ChangeLog src/grep.c tests/fmbtest.sh te...
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jun 2005 21:00:15 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/06/14 20:56:42

Modified files:
	.              : ChangeLog 
	src            : grep.c 
	tests          : fmbtest.sh foad1.sh 

Log message:
	Fix bug #11022 (Line wrapping causes GREP_COLOR background
	color to "smear") by outputting a "clear to end of line"
	control sequence after each SGR (Select Graphic Rendition)
	control sequence (START and END).  This also avoid similar
	problems with HT (tab) characters.
	
	* src/grep.c (SGR_START, SGR_END, PR_SGR_FMT, PR_SGR_FMT_IF,
	PR_SGR_START, PR_SGR_END, PR_SGR_START_IF, PR_SGR_END_IF):
	New macros.
	* src/grep.c (prline): Use the new macros.
	* tests/fmbtest.sh, tests/foad1.sh: Adjust the regression tests
	to expect the new control sequences.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.246&tr2=1.247&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/grep.c.diff?tr1=1.98&tr2=1.99&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/tests/fmbtest.sh.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/tests/foad1.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text




From MAILER-DAEMON Tue Jun 14 17:00:18 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DiIW9-0002gP-W2
	for mharc-grep-commit@gnu.org; Tue, 14 Jun 2005 17:00:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DiIW6-0002fF-PD
	for grep-commit@gnu.org; Tue, 14 Jun 2005 17:00:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DiIW0-0002cy-7Q
	for grep-commit@gnu.org; Tue, 14 Jun 2005 17:00:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DiIVz-0002c8-2K
	for grep-commit@gnu.org; Tue, 14 Jun 2005 17:00:07 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DiIU6-0007HH-EH
	for grep-commit@gnu.org; Tue, 14 Jun 2005 16:58:10 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DiISj-0006gE-Bz
	for grep-cvs-diffs@gnu.org; Tue, 14 Jun 2005 16:56:45 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DiIU5-0007Gj-CI
	for grep-cvs-diffs@gnu.org; Tue, 14 Jun 2005 16:58:09 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DiIU5-0007GL-6r
	for grep-cvs-diffs@gnu.org; Tue, 14 Jun 2005 16:58:09 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DiISg-0007Ec-00
	for <grep-cvs-diffs@gnu.org>; Tue, 14 Jun 2005 16:56:42 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DiISg-0007Ec-00@savannah.gnu.org>
Date: Tue, 14 Jun 2005 16:56:42 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jun 2005 21:00:15 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.246 grep/ChangeLog:1.247
--- grep/ChangeLog:1.246	Fri May  6 04:39:11 2005
+++ grep/ChangeLog	Tue Jun 14 20:56:41 2005
@@ -1,3 +1,18 @@
+2005-06-14  Charles Levert  <charles_levert@gna.org>
+
+	Fix bug #11022 (Line wrapping causes GREP_COLOR background
+	color to "smear") by outputting a "clear to end of line"
+	control sequence after each SGR (Select Graphic Rendition)
+	control sequence (START and END).  This also avoid similar
+	problems with HT (tab) characters.
+
+	* src/grep.c (SGR_START, SGR_END, PR_SGR_FMT, PR_SGR_FMT_IF,
+	  PR_SGR_START, PR_SGR_END, PR_SGR_START_IF, PR_SGR_END_IF):
+	  New macros.
+	* src/grep.c (prline): Use the new macros.
+	* tests/fmbtest.sh, tests/foad1.sh: Adjust the regression tests
+	  to expect the new control sequences.
+
 2005-05-06  Charles Levert  <charles_levert@gna.org>
 
 	* TODO: Add a few more projects and derived versions to check out.



From MAILER-DAEMON Tue Jun 14 17:14:38 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DiIk1-0007jQ-Fu
	for mharc-grep-commit@gnu.org; Tue, 14 Jun 2005 17:14:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DiIjx-0007fK-EI
	for grep-commit@gnu.org; Tue, 14 Jun 2005 17:14:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DiIjs-0007aA-9C
	for grep-commit@gnu.org; Tue, 14 Jun 2005 17:14:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DiIjq-0007Z1-D6
	for grep-commit@gnu.org; Tue, 14 Jun 2005 17:14:26 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DiIjN-0008ES-Ex
	for grep-commit@gnu.org; Tue, 14 Jun 2005 17:13:57 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DiIi0-0006sI-56
	for grep-cvs-diffs@gnu.org; Tue, 14 Jun 2005 17:12:32 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DiIj9-0008D1-MT
	for grep-cvs-diffs@gnu.org; Tue, 14 Jun 2005 17:13:44 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DiIj9-0008CU-Gu
	for grep-cvs-diffs@gnu.org; Tue, 14 Jun 2005 17:13:43 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DiISg-0007Eh-00
	for <grep-cvs-diffs@gnu.org>; Tue, 14 Jun 2005 16:56:42 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DiISg-0007Eh-00@savannah.gnu.org>
Date: Tue, 14 Jun 2005 16:56:42 -0400
Cc: 
Subject: Changes to grep/src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Jun 2005 21:14:34 -0000

Index: grep/src/grep.c
diff -u grep/src/grep.c:1.98 grep/src/grep.c:1.99
--- grep/src/grep.c:1.98	Mon May  2 09:47:48 2005
+++ grep/src/grep.c	Tue Jun 14 20:56:42 2005
@@ -82,6 +82,20 @@
    variable GREP_COLOR.  The default is to print red.  */
 static const char *grep_color = "01;31";
 
+/* Select Graphic Rendition (SGR) strings.  */
+/* Also Erase in Line (EL) to Right by default.  */
+#define SGR_START "\33[%sm\33[K"
+#define SGR_END   "\33[m\33[K"
+
+/* SGR utility macros.  */
+#define PR_SGR_FMT(fmt, s) do { if (*(s)) printf((fmt), (s)); } while (0)
+#define PR_SGR_FMT_IF(fmt, s) \
+  do { if (color_option && *(s)) printf((fmt), (s)); } while (0)
+#define PR_SGR_START(s)    PR_SGR_FMT(   SGR_START, (s))
+#define PR_SGR_END(s)      PR_SGR_FMT(   SGR_END,   (s))
+#define PR_SGR_START_IF(s) PR_SGR_FMT_IF(SGR_START, (s))
+#define PR_SGR_END_IF(s)   PR_SGR_FMT_IF(SGR_END,   (s))
+
 static struct exclude *excluded_patterns;
 static struct exclude *included_patterns;
 /* Short options.  */
@@ -543,11 +557,9 @@
 		break;
 	      if (match_size == 0)
 		break;
-	      if(color_option)
-		printf("\33[%sm", grep_color);
+	      PR_SGR_START_IF(grep_color);
 	      fwrite(b, sizeof (char), match_size, stdout);
-	      if(color_option)
-		fputs("\33[00m", stdout);
+	      PR_SGR_END_IF(grep_color);
 	      fputs("\n", stdout);
 	      beg = b + match_size;
 	      ibeg += match_offset + match_size;
@@ -566,11 +578,9 @@
 	    break;
 	  if (match_size == 0)
 	    break;
-	  if(color_option)
-	    printf("\33[%sm", grep_color);
+	  PR_SGR_START_IF(grep_color);
 	  fwrite(b, sizeof (char), match_size, stdout);
-	  if(color_option)
-	    fputs("\33[00m", stdout);
+	  PR_SGR_END_IF(grep_color);
 	  fputs("\n", stdout);
 	  beg = b + match_size;
         }
@@ -601,9 +611,9 @@
 	      if (match_size == 0)
 	        break;
 	      fwrite (beg, sizeof (char), match_offset, stdout);
-	      printf ("\33[%sm", grep_color);
+	      PR_SGR_START(grep_color);
 	      fwrite (b, sizeof (char), match_size, stdout);
-	      fputs ("\33[00m", stdout);
+	      PR_SGR_END(grep_color);
 	      beg = b + match_size;
 	      ibeg = ibeg + match_offset + match_size;
 	    }
@@ -623,9 +633,9 @@
 	  if (match_size == 0)
 	    break;
 	  fwrite (beg, sizeof (char), match_offset, stdout);
-	  printf ("\33[%sm", grep_color);
+	  PR_SGR_START(grep_color);
 	  fwrite (b, sizeof (char), match_size, stdout);
-	  fputs ("\33[00m", stdout);
+	  PR_SGR_END(grep_color);
 	  beg = b + match_size;
 	}
     }



From MAILER-DAEMON Wed Jun 15 14:58:25 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Did5k-0008Sf-KF
	for mharc-grep-commit@gnu.org; Wed, 15 Jun 2005 14:58:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Did5g-0008QZ-8i
	for grep-commit@gnu.org; Wed, 15 Jun 2005 14:58:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Did5c-0008Op-Uc
	for grep-commit@gnu.org; Wed, 15 Jun 2005 14:58:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Did5c-0008OC-Kp
	for grep-commit@gnu.org; Wed, 15 Jun 2005 14:58:16 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Did6r-0002nG-IB
	for grep-commit@gnu.org; Wed, 15 Jun 2005 14:59:33 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Did5B-0001o2-Fd
	for grep-cvs-diffs@gnu.org; Wed, 15 Jun 2005 14:57:49 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1Did4U-0002eX-QS
	for grep-cvs-diffs@gnu.org; Wed, 15 Jun 2005 14:57:07 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Did4U-0002eU-Lb
	for grep-cvs-diffs@gnu.org; Wed, 15 Jun 2005 14:57:06 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1Did2v-0004UM-00
	for <grep-cvs-diffs@gnu.org>; Wed, 15 Jun 2005 14:55:29 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1Did2v-0004UM-00@savannah.gnu.org>
Date: Wed, 15 Jun 2005 14:55:29 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Jun 2005 18:58:22 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.247 grep/ChangeLog:1.248
--- grep/ChangeLog:1.247	Tue Jun 14 20:56:41 2005
+++ grep/ChangeLog	Wed Jun 15 18:55:27 2005
@@ -1,3 +1,10 @@
+2005-06-15  Charles Levert  <charles_levert@gna.org>
+
+	* tests/foad1.sh: Since this script is run by /bin/sh, it
+	  must work under posix mode.  That means not using assignment
+	  statements right before a function call (LC_ALL=... grep_test,
+	  in this case), because it won't do the expected thing.
+
 2005-06-14  Charles Levert  <charles_levert@gna.org>
 
 	Fix bug #11022 (Line wrapping causes GREP_COLOR background



From MAILER-DAEMON Wed Jun 15 14:58:25 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Did5l-0008Sj-1c
	for mharc-grep-commit@gnu.org; Wed, 15 Jun 2005 14:58:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Did5g-0008Qo-8j
	for grep-commit@gnu.org; Wed, 15 Jun 2005 14:58:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Did5c-0008Ob-J7
	for grep-commit@gnu.org; Wed, 15 Jun 2005 14:58:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Did5c-0008OC-FT
	for grep-commit@gnu.org; Wed, 15 Jun 2005 14:58:16 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Did6r-0002nF-Hy
	for grep-commit@gnu.org; Wed, 15 Jun 2005 14:59:33 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Did5B-0001p6-9i
	for grep-cvs-diffs@gnu.org; Wed, 15 Jun 2005 14:57:49 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1Did4V-0002et-UJ
	for grep-cvs-diffs@gnu.org; Wed, 15 Jun 2005 14:57:08 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Did4V-0002ep-MG
	for grep-cvs-diffs@gnu.org; Wed, 15 Jun 2005 14:57:07 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1Did2w-0004UY-00
	for <grep-cvs-diffs@gnu.org>; Wed, 15 Jun 2005 14:55:30 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1Did2w-0004UY-00@savannah.gnu.org>
Date: Wed, 15 Jun 2005 14:55:30 -0400
Cc: 
Subject: Changes to grep/tests/foad1.sh
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Jun 2005 18:58:22 -0000

Index: grep/tests/foad1.sh
diff -u grep/tests/foad1.sh:1.8 grep/tests/foad1.sh:1.9
--- grep/tests/foad1.sh:1.8	Tue Jun 14 20:56:42 2005
+++ grep/tests/foad1.sh	Wed Jun 15 18:55:28 2005
@@ -82,62 +82,65 @@
 grep_test "LIN7C 55327/" "" -wF -e 5327 -e 5532
 
 
-u=cs_CZ.UTF-8
+# The rest of this file is meant to be executed under this locale.
+LC_ALL=cs_CZ.UTF-8; export LC_ALL
 # If the UTF-8 locale doesn't work, skip these tests silently.
-if LC_ALL="$u" locale -k LC_CTYPE 2>/dev/null |
-  "${GREP}" -q "charmap.*UTF-8"
-then
-  # Test character class erroneously matching a '[' character.
-  LC_ALL="$u" grep_test "[/" "" "[[:alpha:]]" -E
-
-  for mode in F G E; do
-    # Hint:  pipe the output of these tests in
-    #        "| LESS= LESSCHARSET=ascii less".
-    # LETTER N WITH TILDE is U+00F1 and U+00D1.
-    # LETTER Y WITH DIAERESIS is U+00FF and U+0178.
-    LC_ALL="$u" grep_test 'añÿb/AÑŸB/' 'ñÿ/ÑŸ/' 'ñÿ' -o -i -$mode
-    LC_ALL="$u" grep_test 'añÿb/AÑŸB/' 'ñÿ/ÑŸ/' 'ÑŸ' -o -i -$mode
-    LC_ALL="$u" grep_test 'añÿb/AÑŸB/' "a${CB}ñÿ${CE}b/A${CB}ÑŸ${CE}B/" 'ñÿ' --color=always -i -$mode
-    LC_ALL="$u" grep_test 'añÿb/AÑŸB/' "a${CB}ñÿ${CE}b/A${CB}ÑŸ${CE}B/" 'ÑŸ' --color=always -i -$mode
-
-    # POSIX (about -i):  ... each character in the string is matched
-    # against the pattern, not only the character, but also its case
-    # counterpart (if any), shall be matched.
-    # The following were chosen because of their trickiness due to the
-    # differing UTF-8 octet length of their counterpart and to the
-    # non-reflexivity of their mapping.
-    # Beware of homographs!  Look carefully at the actual octets.
-
-    # lc(U+0130 LATIN CAPITAL LETTER I WITH DOT ABOVE) = U+0069 LATIN SMALL LETTER I
-    LC_ALL="$u" grep_test 'aİb/' "a${CB}İ${CE}b/" 'i' --color=always -i -$mode
-    LC_ALL="$u" grep_test 'aib/' ''               'İ' --color=always -i -$mode
-    LC_ALL="$u" grep_test 'aİb/' ''               'I' --color=always -i -$mode
-    # uc(U+0131 LATIN SMALL LETTER DOTLESS I)          = U+0049 LATIN CAPITAL LETTER I
-    LC_ALL="$u" grep_test 'aıb/' "a${CB}ı${CE}b/" 'I' --color=always -i -$mode
-    LC_ALL="$u" grep_test 'aIb/' ''               'ı' --color=always -i -$mode
-    LC_ALL="$u" grep_test 'aıb/' ''               'i' --color=always -i -$mode
-    # uc(U+017F LATIN SMALL LETTER LONG S)             = U+0053 LATIN CAPITAL LETTER S
-    LC_ALL="$u" grep_test 'aſb/' "a${CB}ſ${CE}b/" 'S' --color=always -i -$mode
-    LC_ALL="$u" grep_test 'aSb/' ''               'ſ' --color=always -i -$mode
-    LC_ALL="$u" grep_test 'aſb/' ''               's' --color=always -i -$mode
-    # uc(U+1FBE GREEK PROSGEGRAMMENI)                  = U+0399 GREEK CAPITAL LETTER IOTA
-    LC_ALL="$u" grep_test 'aιb/' "a${CB}ι${CE}b/" 'Ι' --color=always -i -$mode
-    LC_ALL="$u" grep_test 'aΙb/' ''               'ι' --color=always -i -$mode
-    LC_ALL="$u" grep_test 'aιb/' ''               'ι' --color=always -i -$mode
-    # lc(U+2126 OHM SIGN)                              = U+03C9 GREEK SMALL LETTER OMEGA
-    LC_ALL="$u" grep_test 'aΩb/' "a${CB}Ω${CE}b/" 'ω' --color=always -i -$mode
-    LC_ALL="$u" grep_test 'aωb/' ''               'Ω' --color=always -i -$mode
-    LC_ALL="$u" grep_test 'aΩb/' ''               'Ω' --color=always -i -$mode
-    # lc(U+212A KELVIN SIGN)                           = U+006B LATIN SMALL LETTER K
-    LC_ALL="$u" grep_test 'aKb/' "a${CB}K${CE}b/" 'k' --color=always -i -$mode
-    LC_ALL="$u" grep_test 'akb/' ''               'K' --color=always -i -$mode
-    LC_ALL="$u" grep_test 'aKb/' ''               'K' --color=always -i -$mode
-    # lc(U+212B ANGSTROM SIGN)                         = U+00E5 LATIN SMALL LETTER A WITH RING ABOVE
-    LC_ALL="$u" grep_test 'aÅb/' "a${CB}Å${CE}b/" 'å' --color=always -i -$mode
-    LC_ALL="$u" grep_test 'aåb/' ''               'Å' --color=always -i -$mode
-    LC_ALL="$u" grep_test 'aÅb/' ''               'Å' --color=always -i -$mode
-  done
-fi
+locale -k LC_CTYPE 2>/dev/null | "${GREP}" -q "charmap.*UTF-8" || exit $failures
 
+# Test character class erroneously matching a '[' character.
+grep_test "[/" "" "[[:alpha:]]" -E
+
+for mode in F G E; do
+  # Hint:  pipe the output of these tests in
+  #        "| LESS= LESSCHARSET=ascii less".
+  # LETTER N WITH TILDE is U+00F1 and U+00D1.
+  # LETTER Y WITH DIAERESIS is U+00FF and U+0178.
+  grep_test 'añÿb/AÑŸB/' 'ñÿ/ÑŸ/' 'ñÿ' -o -i -$mode
+  grep_test 'añÿb/AÑŸB/' 'ñÿ/ÑŸ/' 'ÑŸ' -o -i -$mode
+  grep_test 'añÿb/AÑŸB/' "a${CB}ñÿ${CE}b/A${CB}ÑŸ${CE}B/" 'ñÿ' --color=always -i -$mode
+  grep_test 'añÿb/AÑŸB/' "a${CB}ñÿ${CE}b/A${CB}ÑŸ${CE}B/" 'ÑŸ' --color=always -i -$mode
+
+  # POSIX (about -i):  ... each character in the string is matched
+  # against the pattern, not only the character, but also its case
+  # counterpart (if any), shall be matched.
+  # The following were chosen because of their trickiness due to the
+  # differing UTF-8 octet length of their counterpart and to the
+  # non-reflexivity of their mapping.
+  # Beware of homographs!  Look carefully at the actual octets.
+
+  # lc(U+0130 LATIN CAPITAL LETTER I WITH DOT ABOVE) = U+0069 LATIN SMALL LETTER I
+  grep_test 'aİb/' "a${CB}İ${CE}b/" 'i' --color=always -i -$mode
+  grep_test 'aib/' ''               'İ' --color=always -i -$mode
+  grep_test 'aİb/' ''               'I' --color=always -i -$mode
+  # uc(U+0131 LATIN SMALL LETTER DOTLESS I)          = U+0049 LATIN CAPITAL LETTER I
+  grep_test 'aıb/' "a${CB}ı${CE}b/" 'I' --color=always -i -$mode
+  grep_test 'aIb/' ''               'ı' --color=always -i -$mode
+  grep_test 'aıb/' ''               'i' --color=always -i -$mode
+  # uc(U+017F LATIN SMALL LETTER LONG S)             = U+0053 LATIN CAPITAL LETTER S
+  grep_test 'aſb/' "a${CB}ſ${CE}b/" 'S' --color=always -i -$mode
+  grep_test 'aSb/' ''               'ſ' --color=always -i -$mode
+  grep_test 'aſb/' ''               's' --color=always -i -$mode
+  # uc(U+1FBE GREEK PROSGEGRAMMENI)                  = U+0399 GREEK CAPITAL LETTER IOTA
+  grep_test 'aιb/' "a${CB}ι${CE}b/" 'Ι' --color=always -i -$mode
+  grep_test 'aΙb/' ''               'ι' --color=always -i -$mode
+  grep_test 'aιb/' ''               'ι' --color=always -i -$mode
+  # lc(U+2126 OHM SIGN)                              = U+03C9 GREEK SMALL LETTER OMEGA
+  grep_test 'aΩb/' "a${CB}Ω${CE}b/" 'ω' --color=always -i -$mode
+  grep_test 'aωb/' ''               'Ω' --color=always -i -$mode
+  grep_test 'aΩb/' ''               'Ω' --color=always -i -$mode
+  # lc(U+212A KELVIN SIGN)                           = U+006B LATIN SMALL LETTER K
+  grep_test 'aKb/' "a${CB}K${CE}b/" 'k' --color=always -i -$mode
+  grep_test 'akb/' ''               'K' --color=always -i -$mode
+  grep_test 'aKb/' ''               'K' --color=always -i -$mode
+  # lc(U+212B ANGSTROM SIGN)                         = U+00E5 LATIN SMALL LETTER A WITH RING ABOVE
+  grep_test 'aÅb/' "a${CB}Å${CE}b/" 'å' --color=always -i -$mode
+  grep_test 'aåb/' ''               'Å' --color=always -i -$mode
+  grep_test 'aÅb/' ''               'Å' --color=always -i -$mode
+done
+
+
+# Any tests inserted right here will be performed under an UTF-8 locale.
+# Insert them before LC_ALL is set above to avoid this.
+# Leave this comment last.
 
 exit $failures



From MAILER-DAEMON Wed Jun 15 15:16:07 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DidMt-0006K4-6h
	for mharc-grep-commit@gnu.org; Wed, 15 Jun 2005 15:16:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DidMo-0006El-BC
	for grep-commit@gnu.org; Wed, 15 Jun 2005 15:16:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DidMi-0006D4-PO
	for grep-commit@gnu.org; Wed, 15 Jun 2005 15:15:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DidMi-0006Cn-M8
	for grep-commit@gnu.org; Wed, 15 Jun 2005 15:15:56 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DidLt-00048S-SV
	for grep-commit@gnu.org; Wed, 15 Jun 2005 15:15:05 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DidKD-00026r-Pm
	for grep-cvs-logs@gnu.org; Wed, 15 Jun 2005 15:13:21 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DidKk-00043e-IQ
	for grep-cvs-logs@gnu.org; Wed, 15 Jun 2005 15:13:54 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DidKj-000438-Qv
	for grep-cvs-logs@gnu.org; Wed, 15 Jun 2005 15:13:54 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1Did2x-0004Ul-00
	for <grep-cvs-logs@gnu.org>; Wed, 15 Jun 2005 14:55:31 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1Did2x-0004Ul-00@savannah.gnu.org>
Date: Wed, 15 Jun 2005 14:55:31 -0400
Cc: 
Subject: grep ./ChangeLog tests/foad1.sh
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Jun 2005 19:16:05 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/06/15 18:55:29

Modified files:
	.              : ChangeLog 
	tests          : foad1.sh 

Log message:
	* tests/foad1.sh: Since this script is run by /bin/sh, it
	must work under posix mode.  That means not using assignment
	statements right before a function call (LC_ALL=... grep_test,
	in this case), because it won't do the expected thing.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.247&tr2=1.248&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/tests/foad1.sh.diff?tr1=1.8&tr2=1.9&r1=text&r2=text




From MAILER-DAEMON Mon Jun 20 00:11:20 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkDd2-0007f9-4I
	for mharc-grep-commit@gnu.org; Mon, 20 Jun 2005 00:11:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DjtqH-0005Om-L5
	for grep-commit@gnu.org; Sun, 19 Jun 2005 03:03:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DjtqF-0005Nc-6a
	for grep-commit@gnu.org; Sun, 19 Jun 2005 03:03:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DjtqE-0005Mm-PI
	for grep-commit@gnu.org; Sun, 19 Jun 2005 03:03:38 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DjtoD-0005VV-Jx
	for grep-commit@gnu.org; Sun, 19 Jun 2005 03:01:33 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DjtlM-0005Q3-N7
	for grep-webcvs-diffs@gnu.org; Sun, 19 Jun 2005 02:58:37 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DjtVw-000557-BT
	for grep-webcvs-diffs@gnu.org; Sun, 19 Jun 2005 02:42:40 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DjtVv-000551-Vt
	for grep-webcvs-diffs@gnu.org; Sun, 19 Jun 2005 02:42:40 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DjtTZ-0004sQ-00
	for <grep-webcvs-diffs@gnu.org>; Sun, 19 Jun 2005 02:40:13 -0400
To: grep-webcvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DjtTZ-0004sQ-00@savannah.gnu.org>
Date: Sun, 19 Jun 2005 02:40:13 -0400
X-Mailman-Approved-At: Mon, 20 Jun 2005 00:11:18 -0400
Cc: 
Subject: Changes to grep/devel.html
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Jun 2005 07:03:42 -0000

Index: grep/devel.html
diff -u grep/devel.html:1.3 grep/devel.html:1.4
--- grep/devel.html:1.3	Thu Jun  9 21:34:42 2005
+++ grep/devel.html	Sun Jun 19 06:40:11 2005
@@ -144,6 +144,12 @@
 >X-Savane-Project: grep
 X-Savane-Tracker: patch
 </pre
+    ><p
+      >or:</p
+    ><pre
+>X-Savane-Project: grep
+X-Savane-Tracker: support
+</pre
 
     ><h3
       >2.2&nbsp; The <tt>grep-commit</tt> mailing list</h3
@@ -1406,6 +1412,71 @@
       ></dd
 
       ><dt
+        >OpenPKG</dt
+      ><dd
+        ><table border="1" cellspacing="0" cellpadding="2"
+          ><tr
+            ><td
+              >Web site</td
+            ><td
+              ><a href="http://www.openpkg.org/"
+                >http://www.openpkg.org/</a
+            ></td
+          ></tr
+          ><tr
+            ><td
+              >Maintainer</td
+            ><td
+              >Ralf S. Engelschall<tt
+                >&lt;rse at openpkg.org&gt;</tt
+            ></td
+          ></tr
+          ><tr
+            ><td
+              >Managed repository</td
+            ><td
+              ><tt
+                >cvs -d :pserver:anonymous@cvs.openpkg.org:/v/openpkg/cvs co openpkg-src/grep</tt
+            ></td
+          ></tr
+          ><tr
+            ><td
+              >Managed repository</td
+            ><td
+              ><tt
+                >rsync -av rsync://rsync.openpkg.org/openpkg-cvs/openpkg-src/grep/ .</tt
+            ></td
+          ></tr
+          ><tr
+            ><td
+              >Managed repository</td
+            ><td
+              ><a href="http://cvs.openpkg.org/dir?d=openpkg-src/grep"
+                >http://cvs.openpkg.org/dir?d=openpkg-src/grep</a
+            ></td
+          ></tr
+          ><tr
+            ><td
+              >Source package name</td
+            ><td
+              >grep</td
+          ></tr
+          ><tr
+            ><td
+              >Binary package name</td
+            ><td
+              >grep</td
+          ></tr
+          ><tr
+            ><td
+              >Entry updated</td
+            ><td
+              >2005-06-19</td
+          ></tr
+        ></table
+      ></dd
+
+      ><dt
         >SuSE Linux</dt
       ><dd
         ><table border="1" cellspacing="0" cellpadding="2"
@@ -1419,6 +1490,14 @@
           ></tr
           ><tr
             ><td
+              >Maintainer</td
+            ><td
+              >Andreas Schwab<tt
+                >&lt;schwab at suse.de&gt;</tt
+            ></td
+          ></tr
+          ><tr
+            ><td
               >Package database entry</td
             ><td
               >Professional <a href="http://www.novell.com/products/linuxpackages/professional/grep.html"
@@ -1441,7 +1520,7 @@
             ><td
               >Entry updated</td
             ><td
-              >2005-05-05</td
+              >2005-06-19</td
           ></tr
         ></table
       ></dd
@@ -1491,7 +1570,7 @@
          provided this notice and the copyright notice are preserved.</p
       ><p
         >Updated: <tt
-          >$Date: 2005/06/09 21:34:42 $</tt
+          >$Date: 2005/06/19 06:40:11 $</tt
         > (UTC) by <tt
           >$Author: charles_levert $</tt
         > (at <tt>savannah.gnu.org</tt>)</p



From MAILER-DAEMON Mon Jun 20 00:11:20 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkDd2-0007fC-8K
	for mharc-grep-commit@gnu.org; Mon, 20 Jun 2005 00:11:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DjtqI-0005PX-RV
	for grep-commit@gnu.org; Sun, 19 Jun 2005 03:03:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DjtqF-0005O5-Q2
	for grep-commit@gnu.org; Sun, 19 Jun 2005 03:03:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DjtqF-0005Mm-EE
	for grep-commit@gnu.org; Sun, 19 Jun 2005 03:03:39 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DjtmT-0005P8-2d
	for grep-commit@gnu.org; Sun, 19 Jun 2005 02:59:45 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Djtjd-0005PV-32
	for grep-webcvs-logs@gnu.org; Sun, 19 Jun 2005 02:56:49 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DjtmO-0005Os-9Z
	for grep-webcvs-logs@gnu.org; Sun, 19 Jun 2005 02:59:40 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DjtmO-0005Of-4m
	for grep-webcvs-logs@gnu.org; Sun, 19 Jun 2005 02:59:40 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DjtTa-0004sX-00
	for <grep-webcvs-logs@gnu.org>; Sun, 19 Jun 2005 02:40:14 -0400
To: grep-webcvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DjtTa-0004sX-00@savannah.gnu.org>
Date: Sun, 19 Jun 2005 02:40:14 -0400
X-Mailman-Approved-At: Mon, 20 Jun 2005 00:11:18 -0400
Cc: 
Subject: grep devel.html
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Jun 2005 07:03:45 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/06/19 06:40:12

Modified files:
	.              : devel.html 

Log message:
	Document email header fields for "support" Savannah tracker.
	Add OpenPKG and update SuSE distributors.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/devel.html.diff?tr1=1.3&tr2=1.4&r1=text&r2=text




From MAILER-DAEMON Mon Jun 20 10:53:27 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkNeR-0002tS-5m
	for mharc-grep-commit@gnu.org; Mon, 20 Jun 2005 10:53:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DkEtJ-0002TZ-A3
	for grep-commit@gnu.org; Mon, 20 Jun 2005 01:32:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DkEtB-0002Qc-IR
	for grep-commit@gnu.org; Mon, 20 Jun 2005 01:32:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DkEtB-0002PJ-89
	for grep-commit@gnu.org; Mon, 20 Jun 2005 01:32:05 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkEtG-0004Tl-0S
	for grep-commit@gnu.org; Mon, 20 Jun 2005 01:32:10 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkEq7-0005Va-10
	for grep-webcvs-logs@gnu.org; Mon, 20 Jun 2005 01:28:55 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkEhP-000433-Mg
	for grep-webcvs-logs@gnu.org; Mon, 20 Jun 2005 01:19:55 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkEhP-00042z-Hu
	for grep-webcvs-logs@gnu.org; Mon, 20 Jun 2005 01:19:55 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkEer-0003He-00
	for <grep-webcvs-logs@gnu.org>; Mon, 20 Jun 2005 01:17:17 -0400
To: grep-webcvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkEer-0003He-00@savannah.gnu.org>
Date: Mon, 20 Jun 2005 01:17:17 -0400
X-Mailman-Approved-At: Mon, 20 Jun 2005 10:53:25 -0400
Cc: 
Subject: grep devel.html
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Jun 2005 05:32:15 -0000

CVSROOT:	/webcvs/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/06/20 05:17:16

Modified files:
	.              : devel.html 

Log message:
	Fixed minor typo.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/devel.html.diff?tr1=1.4&tr2=1.5&r1=text&r2=text




From MAILER-DAEMON Mon Jun 20 10:53:27 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkNeR-0002tr-F1
	for mharc-grep-commit@gnu.org; Mon, 20 Jun 2005 10:53:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DkEtK-0002Tg-BV
	for grep-commit@gnu.org; Mon, 20 Jun 2005 01:32:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DkEtC-0002Qp-Qd
	for grep-commit@gnu.org; Mon, 20 Jun 2005 01:32:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DkEtB-0002PJ-0w
	for grep-commit@gnu.org; Mon, 20 Jun 2005 01:32:05 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkEtG-0004Tr-8G
	for grep-commit@gnu.org; Mon, 20 Jun 2005 01:32:10 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkEq7-0005Va-9P
	for grep-webcvs-diffs@gnu.org; Mon, 20 Jun 2005 01:28:55 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkEhP-00042u-9X
	for grep-webcvs-diffs@gnu.org; Mon, 20 Jun 2005 01:19:55 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkEhP-00042r-4K
	for grep-webcvs-diffs@gnu.org; Mon, 20 Jun 2005 01:19:55 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkEeq-0003Hb-00
	for <grep-webcvs-diffs@gnu.org>; Mon, 20 Jun 2005 01:17:16 -0400
To: grep-webcvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkEeq-0003Hb-00@savannah.gnu.org>
Date: Mon, 20 Jun 2005 01:17:16 -0400
X-Mailman-Approved-At: Mon, 20 Jun 2005 10:53:25 -0400
Cc: 
Subject: Changes to grep/devel.html
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Jun 2005 05:32:20 -0000

Index: grep/devel.html
diff -u grep/devel.html:1.4 grep/devel.html:1.5
--- grep/devel.html:1.4	Sun Jun 19 06:40:11 2005
+++ grep/devel.html	Mon Jun 20 05:17:16 2005
@@ -1427,7 +1427,7 @@
             ><td
               >Maintainer</td
             ><td
-              >Ralf S. Engelschall<tt
+              >Ralf S. Engelschall <tt
                 >&lt;rse at openpkg.org&gt;</tt
             ></td
           ></tr
@@ -1492,7 +1492,7 @@
             ><td
               >Maintainer</td
             ><td
-              >Andreas Schwab<tt
+              >Andreas Schwab <tt
                 >&lt;schwab at suse.de&gt;</tt
             ></td
           ></tr
@@ -1570,7 +1570,7 @@
          provided this notice and the copyright notice are preserved.</p
       ><p
         >Updated: <tt
-          >$Date: 2005/06/19 06:40:11 $</tt
+          >$Date: 2005/06/20 05:17:16 $</tt
         > (UTC) by <tt
           >$Author: charles_levert $</tt
         > (at <tt>savannah.gnu.org</tt>)</p



From MAILER-DAEMON Mon Jun 20 21:33:37 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkXdw-0004M4-Lz
	for mharc-grep-commit@gnu.org; Mon, 20 Jun 2005 21:33:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DkXdu-0004K1-E1
	for grep-commit@gnu.org; Mon, 20 Jun 2005 21:33:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DkXds-0004I8-Ce
	for grep-commit@gnu.org; Mon, 20 Jun 2005 21:33:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DkXds-0004HN-3F
	for grep-commit@gnu.org; Mon, 20 Jun 2005 21:33:32 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkXfd-00088j-Ea
	for grep-commit@gnu.org; Mon, 20 Jun 2005 21:35:21 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkXcD-00077L-Di
	for grep-cvs-diffs@gnu.org; Mon, 20 Jun 2005 21:31:49 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkXEg-00074K-9h
	for grep-cvs-diffs@gnu.org; Mon, 20 Jun 2005 21:07:30 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkXEg-00074F-5X
	for grep-cvs-diffs@gnu.org; Mon, 20 Jun 2005 21:07:30 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkXBv-0007dU-00
	for <grep-cvs-diffs@gnu.org>; Mon, 20 Jun 2005 21:04:39 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkXBv-0007dU-00@savannah.gnu.org>
Date: Mon, 20 Jun 2005 21:04:39 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 01:33:35 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.248 grep/ChangeLog:1.249
--- grep/ChangeLog:1.248	Wed Jun 15 18:55:27 2005
+++ grep/ChangeLog	Tue Jun 21 01:04:38 2005
@@ -1,3 +1,7 @@
+2005-06-20  Charles Levert  <charles_levert@gna.org>
+
+	* src/grep.c: Extensively document the SGR/EL-to-Right issue.
+
 2005-06-15  Charles Levert  <charles_levert@gna.org>
 
 	* tests/foad1.sh: Since this script is run by /bin/sh, it



From MAILER-DAEMON Mon Jun 20 21:37:12 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkXeR-0004cE-AS
	for mharc-grep-commit@gnu.org; Mon, 20 Jun 2005 21:34:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DkXeB-0004Vm-Sr
	for grep-commit@gnu.org; Mon, 20 Jun 2005 21:33:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DkXe5-0004Rj-Vx
	for grep-commit@gnu.org; Mon, 20 Jun 2005 21:33:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DkXe4-0004HN-0V
	for grep-commit@gnu.org; Mon, 20 Jun 2005 21:33:44 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkXa3-0007qP-6X
	for grep-commit@gnu.org; Mon, 20 Jun 2005 21:29:35 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkXWd-00077L-8V
	for grep-cvs-diffs@gnu.org; Mon, 20 Jun 2005 21:26:03 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkXVh-0007hn-3U
	for grep-cvs-diffs@gnu.org; Mon, 20 Jun 2005 21:25:05 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkXVg-0007hk-Tf
	for grep-cvs-diffs@gnu.org; Mon, 20 Jun 2005 21:25:05 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkXBv-0007dc-00
	for <grep-cvs-diffs@gnu.org>; Mon, 20 Jun 2005 21:04:39 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkXBv-0007dc-00@savannah.gnu.org>
Date: Mon, 20 Jun 2005 21:04:39 -0400
Cc: 
Subject: Changes to grep/src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 01:34:01 -0000

Index: grep/src/grep.c
diff -u grep/src/grep.c:1.99 grep/src/grep.c:1.100
--- grep/src/grep.c:1.99	Tue Jun 14 20:56:42 2005
+++ grep/src/grep.c	Tue Jun 21 01:04:39 2005
@@ -82,8 +82,63 @@
    variable GREP_COLOR.  The default is to print red.  */
 static const char *grep_color = "01;31";
 
-/* Select Graphic Rendition (SGR) strings.  */
-/* Also Erase in Line (EL) to Right by default.  */
+/* Select Graphic Rendition (SGR, "\33[...m") strings.  */
+/* Also Erase in Line (EL) to Right ("\33[K") by default.  */
+/*    Why have EL to Right after SGR?
+	 -- The behavior of line-wrapping when at the bottom of the
+	    terminal screen and at the end of the current line is often
+	    such that a new line is introduced, entirely cleared with
+	    the current background color which may be different from the
+	    default one (see the boolean back_color_erase terminfo(5)
+	    capability), thus scrolling the display by one line.
+	    The end of this new line will stay in this background color
+	    even after reverting to the default background color with
+	    "\33[m', unless it is explicitly cleared again with "\33[K"
+	    (which is the behavior the user would instinctively expect
+	    from the whole thing).  There may be some unavoidable
+	    background-color flicker at the end of this new line because
+	    of this (when timing with the monitor's redraw is just right).
+	 -- The behavior of HT (tab, "\t") is usually the same as that of
+	    Cursor Forward Tabulation (CHT) with a default parameter
+	    of 1 ("\33[I"), i.e., it performs pure movement to the next
+	    tab stop, without any clearing of either content or screen
+	    attributes (including background color); try
+	       echo -ne 'asdfqwerzxcv\rASDF\tZXCV\n'
+	    in a bash(1) shell to demonstrate this.  This is not what the
+	    user would instinctively expect of HT (but is ok for CHT).
+	    The instinctive behavior would include clearing the terminal
+	    cells that are skipped over by HT with blank cells in the
+	    current screen attributes, including background color;
+	    the boolean dest_tabs_magic_smso terminfo(5) capability
+	    indicates this saner behavior for HT, but only some rare
+	    terminals have it (although it also indicates a special
+	    glitch with standout mode in the Teleray terminal for which
+	    it was initially introduced).  The remedy is to add "\33K"
+	    after each SGR sequence, be it START (to fix the behavior
+	    of any HT after that before another SGR) or END (to fix the
+	    behavior of an HT in default background color that would
+	    follow a line-wrapping at the bottom of the screen in another
+	    background color, and to complement doing it after START).
+	    Piping grep's output through a pager such as less(1) avoids
+	    any HT problems since the pager performs tab expansion.
+
+      Generic disadvantages of this remedy are:
+	 -- Some very rare terminals might support SGR but not EL (nobody
+	    will use "grep --color" on a terminal that does not support
+	    SGR in the first place).
+	 -- Having these extra control sequences might somewhat complicate
+	    the task of any program trying to parse "grep --color"
+	    output in order to extract structuring information from it.
+      A specific disadvantage to doing it after SGR START is:
+	 -- Even more possible background color flicker (when timing
+	    with the monitor's redraw is just right), even when not at the
+	    bottom of the screen.
+      There are no additional disadvantages specific to doing it after
+      SGR END.
+
+      It would be impractical for GNU grep to become a full-fledged
+      terminal program linked against ncurses or the like, so it will
+      not detect terminfo(5) capabilities.  */
 #define SGR_START "\33[%sm\33[K"
 #define SGR_END   "\33[m\33[K"
 



From MAILER-DAEMON Mon Jun 20 21:37:16 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkXeR-0004cL-Ky
	for mharc-grep-commit@gnu.org; Mon, 20 Jun 2005 21:34:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DkXeD-0004Wn-Mv
	for grep-commit@gnu.org; Mon, 20 Jun 2005 21:33:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DkXe5-0004S6-EX
	for grep-commit@gnu.org; Mon, 20 Jun 2005 21:33:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DkXe4-0004HN-9V
	for grep-commit@gnu.org; Mon, 20 Jun 2005 21:33:44 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkXa3-0007qH-24
	for grep-commit@gnu.org; Mon, 20 Jun 2005 21:29:35 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkXWd-00077L-3Y
	for grep-cvs-logs@gnu.org; Mon, 20 Jun 2005 21:26:03 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkXVi-0007iH-DQ
	for grep-cvs-logs@gnu.org; Mon, 20 Jun 2005 21:25:06 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkXVi-0007hk-87
	for grep-cvs-logs@gnu.org; Mon, 20 Jun 2005 21:25:06 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkXBv-0007df-00
	for <grep-cvs-logs@gnu.org>; Mon, 20 Jun 2005 21:04:39 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkXBv-0007df-00@savannah.gnu.org>
Date: Mon, 20 Jun 2005 21:04:39 -0400
Cc: 
Subject: grep ./ChangeLog src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 01:34:01 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/06/21 01:04:39

Modified files:
	.              : ChangeLog 
	src            : grep.c 

Log message:
	* src/grep.c: Extensively document the SGR/EL-to-Right issue.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.248&tr2=1.249&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/grep.c.diff?tr1=1.99&tr2=1.100&r1=text&r2=text




From MAILER-DAEMON Mon Jun 20 23:32:47 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkZVG-0007OE-2A
	for mharc-grep-commit@gnu.org; Mon, 20 Jun 2005 23:32:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DkZV9-0007IE-Jn
	for grep-commit@gnu.org; Mon, 20 Jun 2005 23:32:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DkZV3-0007DK-8b
	for grep-commit@gnu.org; Mon, 20 Jun 2005 23:32:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DkZV2-0007BW-51
	for grep-commit@gnu.org; Mon, 20 Jun 2005 23:32:32 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkZVW-0005PR-6D
	for grep-commit@gnu.org; Mon, 20 Jun 2005 23:33:02 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkZS4-0000dm-DH
	for grep-cvs-logs@gnu.org; Mon, 20 Jun 2005 23:29:28 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkZGw-0004kc-Kd
	for grep-cvs-logs@gnu.org; Mon, 20 Jun 2005 23:17:58 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkZGw-0004kY-GM
	for grep-cvs-logs@gnu.org; Mon, 20 Jun 2005 23:17:58 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkZEB-0001lN-00
	for <grep-cvs-logs@gnu.org>; Mon, 20 Jun 2005 23:15:07 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkZEB-0001lN-00@savannah.gnu.org>
Date: Mon, 20 Jun 2005 23:15:07 -0400
Cc: 
Subject: grep ./ChangeLog src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 03:32:43 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/06/21 03:15:06

Modified files:
	.              : ChangeLog 
	src            : grep.c 

Log message:
	* src/grep.c: Explain the context and logic for choosing default
	--color screen attributes (SGR parameters).

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.249&tr2=1.250&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/grep.c.diff?tr1=1.100&tr2=1.101&r1=text&r2=text




From MAILER-DAEMON Mon Jun 20 23:32:54 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkZVL-0007QK-Bu
	for mharc-grep-commit@gnu.org; Mon, 20 Jun 2005 23:32:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DkZVA-0007Ii-1E
	for grep-commit@gnu.org; Mon, 20 Jun 2005 23:32:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DkZV2-0007D6-PP
	for grep-commit@gnu.org; Mon, 20 Jun 2005 23:32:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DkZV1-0007BW-41
	for grep-commit@gnu.org; Mon, 20 Jun 2005 23:32:31 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkZVW-0005Pb-E1
	for grep-commit@gnu.org; Mon, 20 Jun 2005 23:33:02 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkZS4-0000dm-Lj
	for grep-cvs-diffs@gnu.org; Mon, 20 Jun 2005 23:29:28 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkZGw-0004kQ-0P
	for grep-cvs-diffs@gnu.org; Mon, 20 Jun 2005 23:17:58 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkZGv-0004kN-Rq
	for grep-cvs-diffs@gnu.org; Mon, 20 Jun 2005 23:17:57 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkZEA-0001lD-00
	for <grep-cvs-diffs@gnu.org>; Mon, 20 Jun 2005 23:15:06 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkZEA-0001lD-00@savannah.gnu.org>
Date: Mon, 20 Jun 2005 23:15:06 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 03:32:46 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.249 grep/ChangeLog:1.250
--- grep/ChangeLog:1.249	Tue Jun 21 01:04:38 2005
+++ grep/ChangeLog	Tue Jun 21 03:15:06 2005
@@ -2,6 +2,9 @@
 
 	* src/grep.c: Extensively document the SGR/EL-to-Right issue.
 
+	* src/grep.c: Explain the context and logic for choosing default
+	  --color screen attributes (SGR parameters).
+
 2005-06-15  Charles Levert  <charles_levert@gna.org>
 
 	* tests/foad1.sh: Since this script is run by /bin/sh, it



From MAILER-DAEMON Mon Jun 20 23:32:57 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkZVN-0007Rr-SX
	for mharc-grep-commit@gnu.org; Mon, 20 Jun 2005 23:32:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DkZVA-0007Id-16
	for grep-commit@gnu.org; Mon, 20 Jun 2005 23:32:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DkZV2-0007Db-Nd
	for grep-commit@gnu.org; Mon, 20 Jun 2005 23:32:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DkZV2-0007BW-E2
	for grep-commit@gnu.org; Mon, 20 Jun 2005 23:32:32 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkZVV-0005PJ-Tk
	for grep-commit@gnu.org; Mon, 20 Jun 2005 23:33:01 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkZS4-0000dm-5D
	for grep-cvs-diffs@gnu.org; Mon, 20 Jun 2005 23:29:28 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkZGw-0004kj-RL
	for grep-cvs-diffs@gnu.org; Mon, 20 Jun 2005 23:17:59 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkZGw-0004kY-Lg
	for grep-cvs-diffs@gnu.org; Mon, 20 Jun 2005 23:17:58 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkZEB-0001lH-00
	for <grep-cvs-diffs@gnu.org>; Mon, 20 Jun 2005 23:15:07 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkZEB-0001lH-00@savannah.gnu.org>
Date: Mon, 20 Jun 2005 23:15:07 -0400
Cc: 
Subject: Changes to grep/src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 03:32:47 -0000

Index: grep/src/grep.c
diff -u grep/src/grep.c:1.100 grep/src/grep.c:1.101
--- grep/src/grep.c:1.100	Tue Jun 21 01:04:39 2005
+++ grep/src/grep.c	Tue Jun 21 03:15:06 2005
@@ -78,9 +78,51 @@
 /* If nonzero, show only the part of a line matching the expression. */
 static int only_matching;
 
-/* The color string used.  The user can overwrite it using the environment
-   variable GREP_COLOR.  The default is to print red.  */
-static const char *grep_color = "01;31";
+/* The context and logic for choosing default --color screen attributes
+   (foreground and background colors, etc.) are the following.
+      -- There are eight basic colors available, each with its own
+	 nominal luminosity to the human eye and foreground/background
+	 codes (black [0 %, 30/40], blue [11 %, 34/44], red [30 %, 31/41],
+	 magenta [41 %, 35/45], green [59 %, 32/42], cyan [70 %, 36/46],
+	 yellow [89 %, 33/43], and white [100 %, 37/47]).
+      -- Sometimes, white as a background is actually implemented using
+	 a shade of light gray, so that a foreground white can be visible
+	 on top of it (but most often not).
+      -- Sometimes, black as a foreground is actually implemented using
+	 a shade of dark gray, so that it can be visible on top of a
+	 background black (but most often not).
+      -- Sometimes, more colors are available, as extensions.
+      -- Other attributes can be selected/deselected (bold [1/22],
+	 underline [4/24], standout/inverse [7/27], blink [5/25], and
+	 invisible/hidden [8/28]).  They are sometimes implemented by
+	 using colors instead of what their names imply; e.g., bold is
+	 often achieved by using brighter colors.  In practice, only bold
+	 is really available to us, underline sometimes being mapped by
+	 the terminal to some strange color choice, and standout best
+	 being left for use by downstream programs such as less(1).
+      -- We cannot assume that any of the extensions or special features
+	 are available for the purpose of choosing defaults for everyone.
+      -- The most prevalent default terminal backgrounds are pure black
+	 and pure white, and are not necessarily the same shades of
+	 those as if they were selected explicitly with SGR sequences.
+	 Some terminals use dark or light pictures as default background,
+	 but those are covered over by an explicit selection of background
+	 color with an SGR sequence; their users will appreciate their
+	 background pictures not be covered like this, if possible.
+      -- Some uses of colors attributes is to make some output items
+	 more understated (e.g., context lines); this cannot be achieved
+	 by changing the background color.
+      -- For these reasons, the grep color defaults should strive not
+	 to change the background color from its default, unless it's
+	 for a short item that should be highlighted, not understated.
+      -- The grep foreground color defaults (without an explicitly set
+	 background) should provide enough contrast to be readable on any
+	 terminal with either a black (dark) or white (light) background.
+	 This only leaves red, magenta, green, and cyan (and their bold
+	 counterparts) and possibly bold blue.  */
+/* The color string used for matched text.
+   The user can overwrite it using the environment variable GREP_COLOR.  */
+static const char *grep_color = "01;31";	/* bold red */
 
 /* Select Graphic Rendition (SGR, "\33[...m") strings.  */
 /* Also Erase in Line (EL) to Right ("\33[K") by default.  */



From MAILER-DAEMON Tue Jun 21 01:06:50 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Dkav4-0004Su-Ao
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 01:03:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dkaus-0004Pe-OT
	for grep-commit@gnu.org; Tue, 21 Jun 2005 01:03:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dkauj-0004K1-Ut
	for grep-commit@gnu.org; Tue, 21 Jun 2005 01:03:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dkauj-0004I7-0h
	for grep-commit@gnu.org; Tue, 21 Jun 2005 01:03:09 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkar4-00014Y-B0
	for grep-commit@gnu.org; Tue, 21 Jun 2005 00:59:22 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dkanb-0001zA-Bx
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 00:55:47 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1Dkaq5-00011W-D8
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 00:58:21 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkaq5-00011T-8o
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 00:58:21 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkanG-0002Pe-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 00:55:26 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkanG-0002Pe-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 00:55:26 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 05:03:27 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.250 grep/ChangeLog:1.251
--- grep/ChangeLog:1.250	Tue Jun 21 03:15:06 2005
+++ grep/ChangeLog	Tue Jun 21 04:55:26 2005
@@ -1,3 +1,10 @@
+2005-06-21  Charles Levert  <charles_levert@gna.org>
+
+	* src/grep.c (nlscan): Make this function more robust by removing
+	  the undocumented assumption that its "lim" argument points
+	  right after a line boundary.  This will be used later to fix
+	  --byte-offset's broken behavior.  Patch #3769.
+
 2005-06-20  Charles Levert  <charles_levert@gna.org>
 
 	* src/grep.c: Extensively document the SGR/EL-to-Right issue.



From MAILER-DAEMON Tue Jun 21 01:30:29 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkbLA-0007qh-Lz
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 01:30:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DkbL4-0007mQ-Gh
	for grep-commit@gnu.org; Tue, 21 Jun 2005 01:30:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DkbL2-0007lT-FQ
	for grep-commit@gnu.org; Tue, 21 Jun 2005 01:30:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DkbL2-0007l5-7k
	for grep-commit@gnu.org; Tue, 21 Jun 2005 01:30:20 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkbMd-0002RT-9g
	for grep-commit@gnu.org; Tue, 21 Jun 2005 01:31:59 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkbJ9-0002M9-RZ
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 01:28:23 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1Dkb6H-0001uL-2p
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 01:15:07 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkb6G-0001u2-Gx
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 01:15:05 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkanK-0002Ps-00
	for <grep-cvs-logs@gnu.org>; Tue, 21 Jun 2005 00:55:30 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkanK-0002Ps-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 00:55:30 -0400
Cc: 
Subject: grep ./ChangeLog src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 05:30:27 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/06/21 04:55:26

Modified files:
	.              : ChangeLog 
	src            : grep.c 

Log message:
	* src/grep.c (nlscan): Make this function more robust by removing
	the undocumented assumption that its "lim" argument points
	right after a line boundary.  This will be used later to fix
	--byte-offset's broken behavior.  Patch #3769.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.250&tr2=1.251&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/grep.c.diff?tr1=1.101&tr2=1.102&r1=text&r2=text




From MAILER-DAEMON Tue Jun 21 01:30:37 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkbLI-0007us-O5
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 01:30:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DkbL6-0007oK-Mh
	for grep-commit@gnu.org; Tue, 21 Jun 2005 01:30:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DkbL3-0007lr-AH
	for grep-commit@gnu.org; Tue, 21 Jun 2005 01:30:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DkbL2-0007l5-OA
	for grep-commit@gnu.org; Tue, 21 Jun 2005 01:30:20 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkbM9-0002P8-NU
	for grep-commit@gnu.org; Tue, 21 Jun 2005 01:31:29 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkbIg-0002M9-8j
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 01:27:54 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkbCb-00025f-Lh
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 01:21:37 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkbCb-00025c-F1
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 01:21:37 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1Dkb9p-0003OF-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 01:18:45 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1Dkb9p-0003OF-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 01:18:45 -0400
Cc: 
Subject: Changes to grep/src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 05:30:32 -0000

Index: grep/src/grep.c
diff -u grep/src/grep.c:1.102 grep/src/grep.c:1.103
--- grep/src/grep.c:1.102	Tue Jun 21 04:55:26 2005
+++ grep/src/grep.c	Tue Jun 21 05:18:44 2005
@@ -1799,6 +1799,14 @@
     out_after = default_context;
   if (out_before < 0)
     out_before = default_context;
+  if (only_matching && (out_after > 0 || out_before > 0))
+    {
+      fprintf(stderr,
+	     _("%s: Any context line specification "
+	       "is ignored with -o/--only-matching.\n"),
+	     program_name);
+      out_after = out_before = 0;
+    }
 
   if (color_option)
     {



From MAILER-DAEMON Tue Jun 21 01:30:39 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkbLJ-0007vA-4F
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 01:30:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DkbL6-0007nE-Oj
	for grep-commit@gnu.org; Tue, 21 Jun 2005 01:30:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DkbL3-0007la-1Z
	for grep-commit@gnu.org; Tue, 21 Jun 2005 01:30:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DkbL2-0007l5-E0
	for grep-commit@gnu.org; Tue, 21 Jun 2005 01:30:20 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkbMd-0002RK-2k
	for grep-commit@gnu.org; Tue, 21 Jun 2005 01:31:59 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkbJ9-0002M9-Ls
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 01:28:23 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1Dkb6I-0001uZ-PY
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 01:15:09 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkb6I-0001u2-6h
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 01:15:06 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkanJ-0002Pl-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 00:55:29 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkanJ-0002Pl-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 00:55:29 -0400
Cc: 
Subject: Changes to grep/src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 05:30:32 -0000

Index: grep/src/grep.c
diff -u grep/src/grep.c:1.101 grep/src/grep.c:1.102
--- grep/src/grep.c:1.101	Tue Jun 21 03:15:06 2005
+++ grep/src/grep.c	Tue Jun 21 04:55:26 2005
@@ -589,8 +589,13 @@
 {
   size_t newlines = 0;
   char const *beg;
-  for (beg = lastnl; beg != lim; beg = memchr (beg, eolbyte, lim - beg), beg++)
-    newlines++;
+  for (beg = lastnl; beg < lim; beg++)
+    {
+      beg = memchr (beg, eolbyte, lim - beg);
+      if (!beg)
+	break;
+      newlines++;
+    }
   totalnl = add_count (totalnl, newlines);
   lastnl = lim;
 }



From MAILER-DAEMON Tue Jun 21 01:30:40 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkbLL-0007w0-7L
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 01:30:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DkbL6-0007nI-Ol
	for grep-commit@gnu.org; Tue, 21 Jun 2005 01:30:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DkbL2-0007ld-V5
	for grep-commit@gnu.org; Tue, 21 Jun 2005 01:30:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DkbL2-0007l5-Ig
	for grep-commit@gnu.org; Tue, 21 Jun 2005 01:30:20 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkbM9-0002PH-Uj
	for grep-commit@gnu.org; Tue, 21 Jun 2005 01:31:29 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkbIg-0002M9-Hn
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 01:27:54 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkbCb-00025X-Cu
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 01:21:37 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkbCb-00025U-7w
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 01:21:37 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1Dkb9o-0003O9-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 01:18:44 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1Dkb9o-0003O9-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 01:18:44 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 05:30:32 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.251 grep/ChangeLog:1.252
--- grep/ChangeLog:1.251	Tue Jun 21 04:55:26 2005
+++ grep/ChangeLog	Tue Jun 21 05:18:44 2005
@@ -5,6 +5,14 @@
 	  right after a line boundary.  This will be used later to fix
 	  --byte-offset's broken behavior.  Patch #3769.
 
+	* src/grep.c (main): Add a test to check if -o/--only-matching
+	  and context lines are both specified and if so, set both context
+	  specifications (before and after) to zero then print an explicit
+	  warning to stderr explaining what was done and why (as opposed
+	  to drastically aborting the process in error).  Patch #3768.
+	  Other code needs this zero setting to work correctly without
+	  having to repeatedly test for this conflictual condition.
+
 2005-06-20  Charles Levert  <charles_levert@gna.org>
 
 	* src/grep.c: Extensively document the SGR/EL-to-Right issue.



From MAILER-DAEMON Tue Jun 21 01:30:44 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkbLP-0007y1-Ih
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 01:30:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DkbLE-0007rT-Q0
	for grep-commit@gnu.org; Tue, 21 Jun 2005 01:30:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DkbL3-0007m0-PD
	for grep-commit@gnu.org; Tue, 21 Jun 2005 01:30:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DkbL2-0007l5-VK
	for grep-commit@gnu.org; Tue, 21 Jun 2005 01:30:20 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkbM9-0002P1-GB
	for grep-commit@gnu.org; Tue, 21 Jun 2005 01:31:29 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkbIg-0002M9-2I
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 01:27:54 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkbCb-00025p-Ul
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 01:21:38 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkbCb-00025k-Nb
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 01:21:37 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1Dkb9p-0003OI-00
	for <grep-cvs-logs@gnu.org>; Tue, 21 Jun 2005 01:18:45 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1Dkb9p-0003OI-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 01:18:45 -0400
Cc: 
Subject: grep ./ChangeLog src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 05:30:37 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/06/21 05:18:44

Modified files:
	.              : ChangeLog 
	src            : grep.c 

Log message:
	* src/grep.c (main): Add a test to check if -o/--only-matching
	and context lines are both specified and if so, set both context
	specifications (before and after) to zero then print an explicit
	warning to stderr explaining what was done and why (as opposed
	to drastically aborting the process in error).  Patch #3768.
	Other code needs this zero setting to work correctly without
	having to repeatedly test for this conflictual condition.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.251&tr2=1.252&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/grep.c.diff?tr1=1.102&tr2=1.103&r1=text&r2=text




From MAILER-DAEMON Tue Jun 21 02:32:13 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkcIt-0008AP-Mj
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 02:32:12 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DkcIk-00087G-PZ
	for grep-commit@gnu.org; Tue, 21 Jun 2005 02:32:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DkcIh-00085r-3f
	for grep-commit@gnu.org; Tue, 21 Jun 2005 02:31:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DkcIg-00084h-Qb
	for grep-commit@gnu.org; Tue, 21 Jun 2005 02:31:58 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkcHc-0005dt-1k
	for grep-commit@gnu.org; Tue, 21 Jun 2005 02:30:52 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkcE7-0003HA-L4
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 02:27:15 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1Dkc9d-0005Af-NP
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 02:22:38 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkc9d-0005Ac-IV
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 02:22:37 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1Dkc6q-0008SY-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 02:19:44 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1Dkc6q-0008SY-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 02:19:44 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 06:32:05 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.252 grep/ChangeLog:1.253
--- grep/ChangeLog:1.252	Tue Jun 21 05:18:44 2005
+++ grep/ChangeLog	Tue Jun 21 06:19:44 2005
@@ -13,6 +13,21 @@
 	  Other code needs this zero setting to work correctly without
 	  having to repeatedly test for this conflictual condition.
 
+	* tests/foad1.sh: Add tests combining -o, -n/-b/-H, and -i,
+	  since there are separate code paths for -i.  Add tests combining
+	  -o, -n/-b/-H, and -3, since any context line specification
+	  should be ignored when combined with -o.
+	* src/grep.c (print_line_head): New function, culled off the
+	  top content of prline().  Adds a guard against "lastnl" having
+	  already reached "lim", which can happen when if the function
+	  is called more than once per line.
+	* src/grep.c (prline): Now calls print_line_head(), not only at
+	  the beginning to replace the moved code when -o is not
+	  specified, but also for each match when -o is specified (two
+	  code paths with this).  Patch #3770, more or less.  This makes
+	  all tests combining -o and -n/-b/-H pass, which they didn't
+	  before.  Fixes bug #12727.
+
 2005-06-20  Charles Levert  <charles_levert@gna.org>
 
 	* src/grep.c: Extensively document the SGR/EL-to-Right issue.



From MAILER-DAEMON Tue Jun 21 02:32:14 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkcIs-00089l-1r
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 02:32:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DkcIl-00087O-Aw
	for grep-commit@gnu.org; Tue, 21 Jun 2005 02:32:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DkcIj-00086V-3n
	for grep-commit@gnu.org; Tue, 21 Jun 2005 02:32:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DkcIi-00084h-0Q
	for grep-commit@gnu.org; Tue, 21 Jun 2005 02:32:00 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkcHb-0005da-79
	for grep-commit@gnu.org; Tue, 21 Jun 2005 02:30:51 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkcE6-0003HA-PA
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 02:27:14 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1Dkc9e-0005Ay-9x
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 02:22:38 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkc9e-0005Au-11
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 02:22:38 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1Dkc6r-0008Sg-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 02:19:45 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1Dkc6r-0008Sg-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 02:19:45 -0400
Cc: 
Subject: Changes to grep/tests/foad1.sh
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 06:32:04 -0000

Index: grep/tests/foad1.sh
diff -u grep/tests/foad1.sh:1.9 grep/tests/foad1.sh:1.10
--- grep/tests/foad1.sh:1.9	Wed Jun 15 18:55:28 2005
+++ grep/tests/foad1.sh	Tue Jun 21 06:19:44 2005
@@ -40,9 +40,17 @@
 
 # Should display the line number (-n), octet offset (-b), or file name
 # (-H) of every match, not just of the first match on each input line.
+# Check it both with and without -i because of the separate code paths.
+# Also check what it does when lines of context are specified.
 grep_test "wA wB/wC/" "1:wA/1:wB/2:wC/" "w." -o -n
+grep_test "wA wB/wC/" "1:wA/1:wB/2:wC/" "w." -o -n -i
+grep_test "wA wB/wC/" "1:wA/1:wB/2:wC/" "w." -o -n -3 2>/dev/null
 grep_test "XwA YwB/ZwC/" "1:wA/5:wB/9:wC/" "w." -o -b
+grep_test "XwA YwB/ZwC/" "1:wA/5:wB/9:wC/" "w." -o -b -i
+grep_test "XwA YwB/ZwC/" "1:wA/5:wB/9:wC/" "w." -o -b -3 2>/dev/null
 grep_test "wA wB/" "(standard input):wA/(standard input):wB/" "w." -o -H
+grep_test "wA wB/" "(standard input):wA/(standard input):wB/" "w." -o -H -i
+grep_test "wA wB/" "(standard input):wA/(standard input):wB/" "w." -o -H -3 2>/dev/null
 
 # End of a previous match should not match a "start of ..." expression.
 grep_test "word_word/" "word_/" "^word_*" -o



From MAILER-DAEMON Tue Jun 21 02:32:19 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkcIz-0008Bt-Ij
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 02:32:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DkcIn-00088J-DV
	for grep-commit@gnu.org; Tue, 21 Jun 2005 02:32:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DkcIi-00086A-Ck
	for grep-commit@gnu.org; Tue, 21 Jun 2005 02:32:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DkcIh-00084h-4t
	for grep-commit@gnu.org; Tue, 21 Jun 2005 02:31:59 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkcHb-0005di-LA
	for grep-commit@gnu.org; Tue, 21 Jun 2005 02:30:51 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkcE7-0003HA-5n
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 02:27:15 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1Dkc9e-0005Ao-0D
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 02:22:38 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkc9d-0005Al-Py
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 02:22:37 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1Dkc6q-0008Sc-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 02:19:44 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1Dkc6q-0008Sc-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 02:19:44 -0400
Cc: 
Subject: Changes to grep/src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 06:32:07 -0000

Index: grep/src/grep.c
diff -u grep/src/grep.c:1.103 grep/src/grep.c:1.104
--- grep/src/grep.c:1.103	Tue Jun 21 05:18:44 2005
+++ grep/src/grep.c	Tue Jun 21 06:19:44 2005
@@ -618,17 +618,21 @@
   fwrite (p, 1, buf + sizeof buf - p, stdout);
 }
 
+/* Print a whole line head (filename, line, byte).  */
 static void
-prline (char const *beg, char const *lim, int sep)
+print_line_head (char const *beg, char const *lim, int sep)
 {
   if (out_file)
     printf ("%s%c", filename, sep & filename_mask);
   if (out_line)
     {
-      nlscan (beg);
-      totalnl = add_count (totalnl, 1);
+      if (lastnl < lim)
+	{
+	  nlscan (beg);
+	  totalnl = add_count (totalnl, 1);
+	  lastnl = lim;
+	}
       print_offset_sep (totalnl, sep);
-      lastnl = lim;
     }
   if (out_byte)
     {
@@ -638,7 +642,14 @@
 #endif
       print_offset_sep (pos, sep);
     }
-  if (only_matching)
+}
+
+static void
+prline (char const *beg, char const *lim, int sep)
+{
+  if (!only_matching)
+    print_line_head(beg, lim, sep);
+  else
     {
       size_t match_size;
       size_t match_offset;
@@ -659,6 +670,7 @@
 		break;
 	      if (match_size == 0)
 		break;
+	      print_line_head(b, lim, sep);
 	      PR_SGR_START_IF(grep_color);
 	      fwrite(b, sizeof (char), match_size, stdout);
 	      PR_SGR_END_IF(grep_color);
@@ -680,6 +692,7 @@
 	    break;
 	  if (match_size == 0)
 	    break;
+	  print_line_head(b, lim, sep);
 	  PR_SGR_START_IF(grep_color);
 	  fwrite(b, sizeof (char), match_size, stdout);
 	  PR_SGR_END_IF(grep_color);



From MAILER-DAEMON Tue Jun 21 03:06:38 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkcqD-0004Hi-AD
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 03:06:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DkcqA-0004FF-Db
	for grep-commit@gnu.org; Tue, 21 Jun 2005 03:06:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dkcq5-0004Dn-KX
	for grep-commit@gnu.org; Tue, 21 Jun 2005 03:06:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dkcq5-0004DU-2A
	for grep-commit@gnu.org; Tue, 21 Jun 2005 03:06:29 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkcru-0007ob-55
	for grep-commit@gnu.org; Tue, 21 Jun 2005 03:08:22 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkcoO-0003z8-OD
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 03:04:45 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkcOw-0006Ks-Ie
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 02:38:26 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkcOw-0006IQ-D0
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 02:38:26 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1Dkc6r-0008Sj-00
	for <grep-cvs-logs@gnu.org>; Tue, 21 Jun 2005 02:19:45 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1Dkc6r-0008Sj-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 02:19:45 -0400
Cc: 
Subject: grep ./ChangeLog tests/foad1.sh src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 07:06:35 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/06/21 06:19:44

Modified files:
	.              : ChangeLog 
	tests          : foad1.sh 
	src            : grep.c 

Log message:
	* tests/foad1.sh: Add tests combining -o, -n/-b/-H, and -i,
	since there are separate code paths for -i.  Add tests combining
	-o, -n/-b/-H, and -3, since any context line specification
	should be ignored when combined with -o.
	* src/grep.c (print_line_head): New function, culled off the
	top content of prline().  Adds a guard against "lastnl" having
	already reached "lim", which can happen when if the function
	is called more than once per line.
	* src/grep.c (prline): Now calls print_line_head(), not only at
	the beginning to replace the moved code when -o is not
	specified, but also for each match when -o is specified (two
	code paths with this).  Patch #3770, more or less.  This makes
	all tests combining -o and -n/-b/-H pass, which they didn't
	before.  Fixes bug #12727.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.252&tr2=1.253&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/tests/foad1.sh.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/grep.c.diff?tr1=1.103&tr2=1.104&r1=text&r2=text




From MAILER-DAEMON Tue Jun 21 10:37:21 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkjsO-0002lg-6A
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 10:37:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dkjs9-0002cm-B2
	for grep-commit@gnu.org; Tue, 21 Jun 2005 10:37:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dkjs3-0002YC-Lv
	for grep-commit@gnu.org; Tue, 21 Jun 2005 10:37:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dkjs3-0002WN-Fn
	for grep-commit@gnu.org; Tue, 21 Jun 2005 10:36:59 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkjsW-0005zs-UL
	for grep-commit@gnu.org; Tue, 21 Jun 2005 10:37:29 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dkjov-0007Ax-NU
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 10:33:45 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkjsV-0005zP-ET
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 10:37:27 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkjsV-0005yT-9A
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 10:37:27 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkjZl-0003TN-00
	for <grep-cvs-logs@gnu.org>; Tue, 21 Jun 2005 10:18:05 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkjZl-0003TN-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 10:18:05 -0400
Cc: 
Subject: grep ./ChangeLog src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 14:37:11 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/06/21 14:18:04

Modified files:
	.              : ChangeLog 
	src            : grep.c 

Log message:
	* src/grep.c (SEP_CHAR_MATCH, SEP_CHAR_CONTEXT, SEP_STR_CHUNK):
	New macros for ':', '-', and "--".  Used throughout the file.
	Will be used even more in upcoming updates, so good to have now.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.253&tr2=1.254&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/grep.c.diff?tr1=1.104&tr2=1.105&r1=text&r2=text




From MAILER-DAEMON Tue Jun 21 10:37:24 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkjsR-0002mc-87
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 10:37:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DkjsD-0002gm-Jq
	for grep-commit@gnu.org; Tue, 21 Jun 2005 10:37:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dkjs4-0002Ya-M6
	for grep-commit@gnu.org; Tue, 21 Jun 2005 10:37:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dkjs3-0002WN-Mn
	for grep-commit@gnu.org; Tue, 21 Jun 2005 10:36:59 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkjsW-0005zk-NV
	for grep-commit@gnu.org; Tue, 21 Jun 2005 10:37:28 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dkjov-0007Ax-Gn
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 10:33:45 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkjsV-0005zY-RB
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 10:37:28 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkjsV-0005yT-MR
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 10:37:27 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkjZl-0003TH-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 10:18:05 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkjZl-0003TH-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 10:18:05 -0400
Cc: 
Subject: Changes to grep/src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 14:37:13 -0000

Index: grep/src/grep.c
diff -u grep/src/grep.c:1.104 grep/src/grep.c:1.105
--- grep/src/grep.c:1.104	Tue Jun 21 06:19:44 2005
+++ grep/src/grep.c	Tue Jun 21 14:18:04 2005
@@ -51,6 +51,10 @@
 #undef MAX
 #define MAX(A,B) ((A) > (B) ? (A) : (B))
 
+#define SEP_CHAR_MATCH   ':'
+#define SEP_CHAR_CONTEXT '-'
+#define SEP_STR_CHUNK    "--"
+
 struct stats
 {
   struct stats const *parent;
@@ -777,7 +781,7 @@
       if (outleft
 	  || (((*execute) (lastout, nl + 1 - lastout, &match_size, 0) == (size_t) -1)
 	      == !out_invert))
-	prline (lastout, nl + 1, '-');
+	prline (lastout, nl + 1, SEP_CHAR_CONTEXT);
       else
 	pending = 0;
     }
@@ -788,7 +792,7 @@
 static void
 prtext (char const *beg, char const *lim, int *nlinesp)
 {
-  static int used;		/* avoid printing "--" before any output */
+  static int used;	/* avoid printing SEP_STR_CHUNK before any output */
   char const *bp, *p;
   char eol = eolbyte;
   int i, n;
@@ -809,16 +813,16 @@
 	    --p;
 	  while (p[-1] != eol);
 
-      /* We print the "--" separator only if our output is
+      /* We print the SEP_STR_CHUNK separator only if our output is
 	 discontiguous from the last output in the file. */
       if ((out_before || out_after) && used && p != lastout)
-	puts ("--");
+	puts (SEP_STR_CHUNK);
 
       while (p < beg)
 	{
 	  char const *nl = memchr (p, eol, beg - p);
 	  nl++;
-	  prline (p, nl, '-');
+	  prline (p, nl, SEP_CHAR_CONTEXT);
 	  p = nl;
 	}
     }
@@ -831,7 +835,7 @@
 	  char const *nl = memchr (p, eol, lim - p);
 	  nl++;
 	  if (!out_quiet)
-	    prline (p, nl, ':');
+	    prline (p, nl, SEP_CHAR_MATCH);
 	  p = nl;
 	}
       *nlinesp = n;
@@ -841,7 +845,7 @@
     }
   else
     if (!out_quiet)
-      prline (beg, lim, ':');
+      prline (beg, lim, SEP_CHAR_MATCH);
 
   pending = out_quiet ? 0 : out_after;
   used = 1;
@@ -1118,7 +1122,7 @@
       if (count_matches)
 	{
 	  if (out_file)
-	    printf ("%s%c", filename, ':' & filename_mask);
+	    printf ("%s%c", filename, SEP_CHAR_MATCH & filename_mask);
 	  printf ("%d\n", count);
 	}
 



From MAILER-DAEMON Tue Jun 21 10:47:59 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Dkk2h-0005Fq-C0
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 10:47:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dkk2b-0005Bs-NW
	for grep-commit@gnu.org; Tue, 21 Jun 2005 10:47:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dkk2Y-00057F-EP
	for grep-commit@gnu.org; Tue, 21 Jun 2005 10:47:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dkk2V-00052a-W6
	for grep-commit@gnu.org; Tue, 21 Jun 2005 10:47:48 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkjuk-0006C0-Oi
	for grep-commit@gnu.org; Tue, 21 Jun 2005 10:39:46 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dkjr9-0007HG-1Y
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 10:36:03 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1Dkjcc-0004rR-Mu
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 10:21:03 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkjcc-0004rO-HO
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 10:21:02 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkjZk-0003TC-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 10:18:04 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkjZk-0003TC-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 10:18:04 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 14:47:54 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.253 grep/ChangeLog:1.254
--- grep/ChangeLog:1.253	Tue Jun 21 06:19:44 2005
+++ grep/ChangeLog	Tue Jun 21 14:18:04 2005
@@ -28,6 +28,10 @@
 	  all tests combining -o and -n/-b/-H pass, which they didn't
 	  before.  Fixes bug #12727.
 
+	* src/grep.c (SEP_CHAR_MATCH, SEP_CHAR_CONTEXT, SEP_STR_CHUNK):
+	  New macros for ':', '-', and "--".  Used throughout the file.
+	  Will be used even more in upcoming updates, so good to have now.
+
 2005-06-20  Charles Levert  <charles_levert@gna.org>
 
 	* src/grep.c: Extensively document the SGR/EL-to-Right issue.



From MAILER-DAEMON Tue Jun 21 11:00:46 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkkF4-0000Sr-Kw
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 11:00:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DkkEz-0000Qj-Fb
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:00:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DkkEw-0000P0-8H
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:00:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DkkEw-0000Oq-4a
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:00:38 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkkH8-000883-OP
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:02:54 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkkDX-00085g-6c
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 10:59:11 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkkG5-00084K-4v
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:01:49 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkkG5-00084H-08
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:01:49 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkkDC-00075M-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 10:58:50 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkkDC-00075M-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 10:58:50 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 15:00:45 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.254 grep/ChangeLog:1.255
--- grep/ChangeLog:1.254	Tue Jun 21 14:18:04 2005
+++ grep/ChangeLog	Tue Jun 21 14:58:49 2005
@@ -32,6 +32,15 @@
 	  New macros for ':', '-', and "--".  Used throughout the file.
 	  Will be used even more in upcoming updates, so good to have now.
 
+	* src/grep.c: The new GREP_COLORS (plural) framework, only
+	  partially used at this point to make for a simpler initial
+	  patch in CVS.  A subset of patch #3644 on Savannah.
+	* src/grep.c (color_cap_ne_fct, color_cap_xm_fct, print_filename,
+	  print_sep, parse_grep_colors): New functions.
+	* src/grep.c (prtext, grepfile, main): Existing functions modified
+	  to use the new framework.
+	* doc/grep.texi, doc/grep.1: Document GREP_COLORS.
+
 2005-06-20  Charles Levert  <charles_levert@gna.org>
 
 	* src/grep.c: Extensively document the SGR/EL-to-Right issue.



From MAILER-DAEMON Tue Jun 21 11:42:16 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkktC-0007MX-Ha
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 11:42:14 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dkksx-0007GB-M7
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:41:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dkksv-0007F6-1Q
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:41:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dkksu-00074z-CV
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:41:56 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkklD-0001Ie-IO
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:33:59 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dkkhb-0000EH-IH
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:30:15 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkkXv-0000ce-2F
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:20:15 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkkXu-0000cZ-Sr
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:20:14 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkkDE-00075a-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 10:58:52 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkkDE-00075a-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 10:58:52 -0400
Cc: 
Subject: Changes to grep/doc/grep.texi
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 15:42:00 -0000

Index: grep/doc/grep.texi
diff -u grep/doc/grep.texi:1.52 grep/doc/grep.texi:1.53
--- grep/doc/grep.texi:1.52	Mon May  2 09:47:48 2005
+++ grep/doc/grep.texi	Tue Jun 21 14:58:50 2005
@@ -262,13 +262,22 @@
 @cindex context
 Print @var{num} lines of output context.
 
-@item --colour[=@var{WHEN}]
-@itemx --color[=@var{WHEN}]
+@item --color[=@var{WHEN}]
+@itemx --colour[=@var{WHEN}]
+@opindex --color
 @opindex --colour
 @cindex highlight, color, colour
-Surround the matching strings with escape sequences to display them in color
-on the terminal.  The color is defined by the environment variable
-@var{GREP_COLOR} and defaults to `01;31' which means the text is red.
+Surround the matching strings, matching lines, context lines, file names,
+line numbers, octet offsets, and separators (for fields and groups
+of context lines) with escape sequences to display them in color on
+the terminal.
+The colors are defined by the environment variable @var{GREP_COLORS}
+and default to `mt=01;31:ml=:cx=:fn=35:ln=32:bn=32:se=36' for bold red
+matched text, magenta file names, green line numbers, green octet offsets,
+cyan separators, and default terminal colors otherwise.
+The deprecated environment variable @var{GREP_COLOR} is still supported,
+but its setting does not have priority; it defaults to `01;31' (bold red)
+which only covers the color for matched text.
 @var{WHEN} is `never', `always', or `auto'.
 
 @item -@var{num}
@@ -576,8 +585,36 @@
 @item GREP_COLOR
 @vindex GREP_COLOR
 @cindex highlight markers
-This variable specifies the color used to highlight the matching text.
-The default is `01;31' which means red text on the default background.
+This variable is deprecated but still supported; its setting does not
+have priority over that of @code{GREP_COLORS}.
+It specifies the color used to highlight the matching text.
+The default is `01;31' which means bold red text on the default
+background.
+
+@item GREP_COLORS
+@vindex GREP_COLORS
+@cindex highlight markers
+This variable specifies the colors used to highlight
+the matching text (mt), matching lines (ml), context lines (cx),
+file names (fn), line numbers (ln), octet offsets (bn),
+and separators (se, for fields and groups of context lines).
+It is a colon-separated list of color specification assignments.
+The default is `mt=01;31:ml=:cx=:fn=35:ln=32:bn=32:se=36' which means
+bold red, default, default, magenta, green, and cyan, all text foregrounds
+on the default background.
+Note that the `ml' setting, if any, remains in effect just before the
+`mt' setting kicks in.
+See the Select Graphic Rendition (SGR, for character attributes)
+section in the documentation of the text terminal that is used
+for permissible values (semicolon-separated lists of integers)
+and their meaning.
+@code{GREP_COLORS} also supports a boolean `ne' capability (with no
+`=...' part) to not clear to the end of line using Erase in Line (EL)
+to Right (`\33[K') each time a colorized item ends (needed on terminals
+on which EL is not supported; otherwise useful on terminals where the
+@code{back_color_erase} (@code{bce}) boolean terminfo capability is not
+specified, when the chosen highlight colors do not affect the background,
+or when EL is too slow to bother doing or causes too much flicker).
 
 @item LC_ALL
 @itemx LC_COLLATE



From MAILER-DAEMON Tue Jun 21 11:42:23 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkktG-0007Os-Sk
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 11:42:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dkksy-0007Ge-L0
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:42:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dkksw-0007FZ-Gc
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:41:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dkksu-00074z-P4
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:41:56 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkklC-0001IO-U4
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:33:58 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dkkha-0000EH-Tb
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 11:30:14 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkkXz-0000dP-RA
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 11:20:20 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkkXz-0000cZ-LS
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 11:20:19 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkkDF-00075s-00
	for <grep-cvs-logs@gnu.org>; Tue, 21 Jun 2005 10:58:53 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkkDF-00075s-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 10:58:53 -0400
Cc: 
Subject: grep ./ChangeLog src/grep.c doc/grep.texi doc/g...
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 15:42:02 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/06/21 14:58:50

Modified files:
	.              : ChangeLog 
	src            : grep.c 
	doc            : grep.texi grep.1 

Log message:
	* src/grep.c: The new GREP_COLORS (plural) framework, only
	partially used at this point to make for a simpler initial
	patch in CVS.  A subset of patch #3644 on Savannah.
	* src/grep.c (color_cap_ne_fct, color_cap_xm_fct, print_filename,
	print_sep, parse_grep_colors): New functions.
	* src/grep.c (prtext, grepfile, main): Existing functions modified
	to use the new framework.
	* doc/grep.texi, doc/grep.1: Document GREP_COLORS.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.254&tr2=1.255&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/grep.c.diff?tr1=1.105&tr2=1.106&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/doc/grep.texi.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/doc/grep.1.diff?tr1=1.29&tr2=1.30&r1=text&r2=text




From MAILER-DAEMON Tue Jun 21 11:42:24 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkktL-0007Pf-J4
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 11:42:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dkkt1-0007Ho-B1
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:42:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dkksx-0007GG-WB
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:42:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dkksw-00074z-Sg
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:41:59 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkklC-0001IG-MJ
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:33:58 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dkkha-0000EH-N0
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:30:14 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkkY2-0000db-8U
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:20:22 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkkY2-0000cZ-15
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:20:22 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkkDE-00075k-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 10:58:53 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkkDE-00075k-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 10:58:53 -0400
Cc: 
Subject: Changes to grep/src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 15:42:05 -0000

Index: grep/src/grep.c
diff -u grep/src/grep.c:1.105 grep/src/grep.c:1.106
--- grep/src/grep.c:1.105	Tue Jun 21 14:18:04 2005
+++ grep/src/grep.c	Tue Jun 21 14:58:50 2005
@@ -79,6 +79,9 @@
 /* If nonzero, use grep_color marker.  */
 static int color_option;
 
+/* If nonzero, do pseudo-markup instead of actual colors.  */
+static int pseudo_markup;
+
 /* If nonzero, show only the part of a line matching the expression. */
 static int only_matching;
 
@@ -125,9 +128,18 @@
 	 This only leaves red, magenta, green, and cyan (and their bold
 	 counterparts) and possibly bold blue.  */
 /* The color string used for matched text.
-   The user can overwrite it using the environment variable GREP_COLOR.  */
+   The user can overwrite it using the deprecated
+   environment variable GREP_COLOR or the new GREP_COLORS.  */
 static const char *grep_color = "01;31";	/* bold red */
 
+/* Other colors.  Defaults look damn good.  */
+static const char *filename_color = "35";	/* magenta */
+static const char *line_num_color = "32";	/* green */
+static const char *byte_num_color = "32";	/* green */
+static const char *sep_color      = "36";	/* cyan */
+static const char *mlines_color   = "";		/* default color pair */
+static const char *context_color  = "";		/* default color pair */
+
 /* Select Graphic Rendition (SGR, "\33[...m") strings.  */
 /* Also Erase in Line (EL) to Right ("\33[K") by default.  */
 /*    Why have EL to Right after SGR?
@@ -185,8 +197,10 @@
       It would be impractical for GNU grep to become a full-fledged
       terminal program linked against ncurses or the like, so it will
       not detect terminfo(5) capabilities.  */
-#define SGR_START "\33[%sm\33[K"
-#define SGR_END   "\33[m\33[K"
+static const char *sgr_start = "\33[%sm\33[K";
+#define SGR_START  sgr_start
+static const char *sgr_end   = "\33[m\33[K";
+#define SGR_END    sgr_end
 
 /* SGR utility macros.  */
 #define PR_SGR_FMT(fmt, s) do { if (*(s)) printf((fmt), (s)); } while (0)
@@ -197,6 +211,61 @@
 #define PR_SGR_START_IF(s) PR_SGR_FMT_IF(SGR_START, (s))
 #define PR_SGR_END_IF(s)   PR_SGR_FMT_IF(SGR_END,   (s))
 
+struct color_cap
+  {
+    const char *name;
+    const char **var;
+    const char *(*fct)(void);
+  };
+
+const char *
+color_cap_ne_fct(void)
+{
+  if (pseudo_markup)
+    return "makes no sense after the \"xm\" capability; ignored";
+
+  sgr_start = "\33[%sm";
+  sgr_end   = "\33[m";
+
+  return NULL;
+}
+
+const char *
+color_cap_xm_fct(void)
+{
+  /* This experimental feature should stay undocumented for now.  */
+  pseudo_markup = 1;
+
+  sgr_start = "<grep:%s>";
+  sgr_end   = "</grep:%s>";
+
+  /* The user can just redefine them to the empty string afterwards.  */
+  grep_color     = "matched-text";
+  filename_color = "filename";
+  line_num_color = "line-number";
+  byte_num_color = "byte-offset";
+  sep_color      = "separator";
+  mlines_color   = "matching-line";
+  context_color  = "context-line";
+
+  return NULL;
+}
+
+/* For GREP_COLORS.  */
+static struct color_cap color_dict[] =
+  {
+    { "mt", &grep_color,	NULL },			/* matched text */
+    { "fn", &filename_color,	NULL },			/* filename */
+    { "ln", &line_num_color,	NULL },			/* line number */
+    { "bn", &byte_num_color,	NULL },			/* byte (sic) offset */
+    { "se", &sep_color,		NULL },			/* separator */
+    { "ml", &mlines_color,	NULL },			/* matching lines */
+    { "cx", &context_color,	NULL },			/* context lines */
+    { "ne", NULL,		color_cap_ne_fct },	/* no EL on SGR_* */
+    { "xm", NULL,		color_cap_xm_fct },	/* pseudo-markup */
+    { NULL, NULL,		NULL }
+  };
+
 static struct exclude *excluded_patterns;
 static struct exclude *included_patterns;
 /* Short options.  */
@@ -604,6 +673,24 @@
   lastnl = lim;
 }
 
+/* Print the current filename.  */
+static void
+print_filename (void)
+{
+  PR_SGR_START_IF(filename_color);
+  fputs(filename, stdout);
+  PR_SGR_END_IF(filename_color);
+}
+
+/* Print a character separator.  */
+static void
+print_sep (char sep)
+{
+  PR_SGR_START_IF(sep_color);
+  fputc(sep, stdout);
+  PR_SGR_END_IF(sep_color);
+}
+
 /* Print a byte offset, followed by a character separator.  */
 static void
 print_offset_sep (uintmax_t pos, char sep)
@@ -816,7 +903,12 @@
       /* We print the SEP_STR_CHUNK separator only if our output is
 	 discontiguous from the last output in the file. */
       if ((out_before || out_after) && used && p != lastout)
-	puts (SEP_STR_CHUNK);
+	{
+	  PR_SGR_START_IF(sep_color);
+	  fputs (SEP_STR_CHUNK, stdout);
+	  PR_SGR_END_IF(sep_color);
+	  fputc('\n', stdout);
+	}
 
       while (p < beg)
 	{
@@ -1122,13 +1214,22 @@
       if (count_matches)
 	{
 	  if (out_file)
-	    printf ("%s%c", filename, SEP_CHAR_MATCH & filename_mask);
+	    {
+	      print_filename();
+	      if (filename_mask)
+		print_sep(SEP_CHAR_MATCH);
+	      else
+		fputc(0, stdout);
+	    }
 	  printf ("%d\n", count);
 	}
 
       status = !count;
       if (list_files == 1 - 2 * status)
-	printf ("%s%c", filename, '\n' & filename_mask);
+	{
+	  print_filename();
+	  fputc('\n' & filename_mask, stdout);
+	}
 
       if (! file)
 	{
@@ -1447,6 +1548,91 @@
   return opt;
 }
 
+/* Parse GREP_COLORS.  The  default would look like:
+     GREP_COLORS='mt=01;31:ml=:cx=:fn=35:ln=32:bn=32:se=36'
+   No character escaping is needed or supported.  */
+static void
+parse_grep_colors (void)
+{
+  const char *p;
+  char *q;
+  char *name;
+  char *val;
+
+  p = getenv("GREP_COLORS"); /* Plural! */
+  if (p == NULL || *p == '\0')
+    return;
+
+  /* Work off a writable copy.  */
+  q = xmalloc(strlen(p) + 1);
+  if (q == NULL)
+    return;
+  strcpy(q, p);
+
+  name = q;
+  val = NULL;
+  /* From now on, be well-formed or you're gone.  */
+  for (;;)
+    if (*q == ':' || *q == '\0')
+      {
+	char c = *q;
+	struct color_cap *cap;
+
+	*q++ = '\0'; /* Terminate name or val.  */
+	/* Empty name without val (empty cap)
+	 * won't match and will be ignored.  */
+	for (cap = color_dict; cap->name; cap++)
+	  if (strcmp(cap->name, name) == 0)
+	    break;
+	/* If name unknown, go on for forward compatibility.  */
+	if (cap->name)
+	  if (cap->var)
+	    {
+	      if (val)
+		*(cap->var) = val;
+	      else
+		fprintf(stderr,
+			_("%s: In GREP_COLORS=\"%s\", the \"%s\" capacity needs a value (\"=...\"); skipped.\n"),
+			program_name, p, name);
+	    }
+	  else if (val)
+	    fprintf(stderr,
+		    _("%s: In GREP_COLORS=\"%s\", the \"%s\" capacity is boolean and cannot take a value (\"=%s\"); skipped.\n"),
+		    program_name, p, name, val);
+	if (cap->fct)
+	  {
+	    const char *err_str = cap->fct();
+
+	    if (err_str)
+	      fprintf(stderr,
+		      _("%s: In GREP_COLORS=\"%s\", the \"%s\" capacity %s.\n"),
+		      program_name, p, name, err_str);
+	  }
+	if (c == '\0')
+	  return;
+	name = q;
+	val = NULL;
+      }
+    else if (*q == '=')
+      {
+	if (q == name || val)
+	  goto ill_formed;
+	*q++ = '\0'; /* Terminate name.  */
+	val = q; /* Can be the empty string.  */
+      }
+    else if (val == NULL)
+      q++; /* Accumulate name.  */
+    else if (*q == ';' || (*q >= '0' && *q <= '9'))
+      q++; /* Accumulate val.  Protect the terminal from being sent crap.  */
+    else
+      goto ill_formed;
+
+ ill_formed:
+  fprintf(stderr,
+	  _("%s: Stopped processing of ill-formed GREP_COLORS=\"%s\" at remaining substring \"%s\".\n"),
+	  program_name, p, q);
+}
+
 int
 main (int argc, char **argv)
 {
@@ -1827,9 +2013,13 @@
 
   if (color_option)
     {
+      /* Legacy.  */
       char *userval = getenv ("GREP_COLOR");
       if (userval != NULL && *userval != '\0')
 	grep_color = userval;
+
+      /* New GREP_COLORS has priority.  */
+      parse_grep_colors();
     }
 
   if (! matcher)



From MAILER-DAEMON Tue Jun 21 11:42:25 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkktL-0007QE-VY
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 11:42:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dkkt2-0007IV-Q1
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:42:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dkkt0-0007HC-GX
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:42:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dkksz-00074z-Cv
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:42:01 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkklC-0001IA-GN
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:33:58 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dkkha-0000EH-GO
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:30:14 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkkY2-0000di-MS
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:20:23 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkkY2-0000cZ-H2
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:20:22 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkkDD-00075Q-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 10:58:51 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkkDD-00075Q-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 10:58:51 -0400
Cc: 
Subject: Changes to grep/doc/grep.1
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 15:42:07 -0000

Index: grep/doc/grep.1
diff -u grep/doc/grep.1:1.29 grep/doc/grep.1:1.30
--- grep/doc/grep.1:1.29	Mon Apr 11 23:56:01 2005
+++ grep/doc/grep.1	Tue Jun 21 14:58:50 2005
@@ -12,7 +12,7 @@
 .de Id
 .ds Dt \\$4
 ..
-.Id $Id: grep.1,v 1.29 2005/04/11 23:56:01 julianfoad Exp $
+.Id $Id: grep.1,v 1.30 2005/06/21 14:58:50 charles_levert Exp $
 .TH GREP 1 \*(Dt "GNU Project"
 .SH NAME
 grep, egrep, fgrep \- print lines matching a pattern
@@ -126,11 +126,35 @@
 which can have nasty side effects if the output is a terminal and if the
 terminal driver interprets some of it as commands.
 .TP
-.BI \-\^\-colour[=\fIWHEN\fR] ", " \-\^\-color[=\fIWHEN\fR]
-Surround the matching strings with escape sequences to display them in color
-on the terminal.  The color is defined by the environment variable
+.BI \-\^\-color[=\fIWHEN\fR] ", " \-\^\-colour[=\fIWHEN\fR]
+Surround the matching strings, matchings lines, context lines, file
+names, line numbers, octet offsets, and separators (for fields and
+groups of context lines) with escape sequences to display them in color
+on the terminal.
+The colors are defined by the environment variable
+.B GREP_COLORS
+and default to `mt=01;31:ml=:cx=:fn=35:ln=32:bn=32:se=36' for bold red
+matched text, default matching lines, default context lines,
+magenta file names, green line numbers, green octet offsets,
+and cyan separators.
+Note that the `ml' setting, if any, remains in effect just before the
+`mt' setting kicks in.
+See the Select Graphic Rendition (SGR, for character attributes)
+section in the documentation of the text terminal that is used
+for permissible values (semicolon-separated lists of integers)
+and their meaning.
+.B GREP_COLORS
+also supports a boolean `ne' capability (with no `=...' part) to not
+clear to the end of line using Erase in Line (EL) to Right (`\\33[K')
+each time a colorized item ends (needed on terminals on which EL is not
+supported; otherwise useful on terminals where the `back_color_erase'
+(`bce') boolean terminfo capability is not specified, when the chosen
+highlight colors do not affect the background, or when EL is too slow
+to bother doing or causes too much flicker).
+The deprecated environment variable
 .B GREP_COLOR
-and defaults to `01;31' which means the text is red.
+is still supported, but its setting does not have priority; it defaults to
+`01;31' (bold red) which only covers the color for matched text.
 .I WHEN
 is `never', `always', or `auto'.
 .TP
@@ -700,8 +724,15 @@
 so it can be used to specify an option containing whitespace or a backslash.
 .TP
 .B GREP_COLOR
+Deprecated in favor of
+.BR GREP_COLORS ,
+which has priority.
 Specifies the marker for highlighting.
 .TP
+.B GREP_COLORS
+Specifies the markers for highlighting matched text, file names,
+line numbers, octet offsets, and separators.
+.TP
 \fBLC_ALL\fP, \fBLC_COLLATE\fP, \fBLANG\fP
 These variables specify the
 .B LC_COLLATE



From MAILER-DAEMON Tue Jun 21 11:42:30 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkktQ-0007Tf-L4
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 11:42:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dkkt8-0007Kw-6b
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:42:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dkkt4-0007JD-Fh
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:42:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dkkt3-00074z-NB
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:42:05 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkkh5-000152-Qg
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:29:43 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkkdT-0000EH-Sl
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:25:59 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkkdQ-0000uM-J5
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:25:56 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkkdQ-0000uJ-Du
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:25:56 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkkaY-0000K5-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 11:22:58 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkkaY-0000K5-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 11:22:58 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 15:42:11 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.255 grep/ChangeLog:1.256
--- grep/ChangeLog:1.255	Tue Jun 21 14:58:49 2005
+++ grep/ChangeLog	Tue Jun 21 15:22:57 2005
@@ -41,6 +41,12 @@
 	  to use the new framework.
 	* doc/grep.texi, doc/grep.1: Document GREP_COLORS.
 
+	* src/grep.c: The new -T/--initial-tab framework, only
+	  partially used at this point to make for a simpler initial
+	  patch in CVS.  A subset of patch #3644 on Savannah.
+	  The option name/calling convention is the same as for GNU diff.
+	* doc/grep.texi, doc/grep.1: Document -T/--initial-tab.
+
 2005-06-20  Charles Levert  <charles_levert@gna.org>
 
 	* src/grep.c: Extensively document the SGR/EL-to-Right issue.



From MAILER-DAEMON Tue Jun 21 11:42:49 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkktR-0007VJ-Vs
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 11:42:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dkkt7-0007Kd-H7
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:42:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dkkt5-0007Ja-1t
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:42:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dkkt4-00074z-7t
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:42:06 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkkh5-00014u-Jb
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:29:43 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkkdT-0000EH-Mm
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:25:59 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkkdQ-0000uW-US
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:25:57 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkkdQ-0000uR-Lo
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:25:56 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkkaY-0000KA-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 11:22:58 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkkaY-0000KA-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 11:22:58 -0400
Cc: 
Subject: Changes to grep/doc/grep.1
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 15:42:12 -0000

Index: grep/doc/grep.1
diff -u grep/doc/grep.1:1.30 grep/doc/grep.1:1.31
--- grep/doc/grep.1:1.30	Tue Jun 21 14:58:50 2005
+++ grep/doc/grep.1	Tue Jun 21 15:22:58 2005
@@ -12,7 +12,7 @@
 .de Id
 .ds Dt \\$4
 ..
-.Id $Id: grep.1,v 1.30 2005/06/21 14:58:50 charles_levert Exp $
+.Id $Id: grep.1,v 1.31 2005/06/21 15:22:58 charles_levert Exp $
 .TH GREP 1 \*(Dt "GNU Project"
 .SH NAME
 grep, egrep, fgrep \- print lines matching a pattern
@@ -386,6 +386,22 @@
 .B /dev/null
 instead.
 .TP
+.BR \-T ", " \-\^\-initial\-tab
+Makes sure that the first character of actual line content lies on a
+tab stop, so that the alignment of tabs looks normal.
+This is useful when combined with
+.B \-H
+(which is implicit when there is more than one file to search),
+.BR \-n ,
+and
+.BR \-b ;
+these options prepend their output at the beginning of the displayed
+line, before the actual content.
+In order to improve the probability that all matched or context lines
+from a single file will all start at the same column, this also causes
+the line number and octet offset (if present) to be printed in a minimum
+size field width.
+.TP
 .BR \-U ", " \-\^\-binary
 Treat the file(s) as binary.  By default, under MS-DOS and MS-Windows,
 .BR grep



From MAILER-DAEMON Tue Jun 21 11:43:13 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkktS-0007Vd-Fs
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 11:42:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dkkt9-0007La-Hm
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:42:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dkkt6-0007Jw-7M
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:42:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dkkt4-00074z-Pp
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:42:07 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkkh5-00014k-7V
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:29:43 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkkdT-0000EH-9w
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:25:59 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkkdR-0000un-98
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:25:57 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkkdR-0000uk-2V
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:25:57 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkkaY-0000KI-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 11:22:59 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkkaY-0000KI-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 11:22:59 -0400
Cc: 
Subject: Changes to grep/src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 15:42:14 -0000

Index: grep/src/grep.c
diff -u grep/src/grep.c:1.106 grep/src/grep.c:1.107
--- grep/src/grep.c:1.106	Tue Jun 21 14:58:50 2005
+++ grep/src/grep.c	Tue Jun 21 15:22:58 2005
@@ -85,6 +85,9 @@
 /* If nonzero, show only the part of a line matching the expression. */
 static int only_matching;
 
+/* If nonzero, make sure first content char in a line is on a tab stop. */
+static int align_tabs;
+
 /* The context and logic for choosing default --color screen attributes
    (foreground and background colors, etc.) are the following.
       -- There are eight basic colors available, each with its own
@@ -270,7 +273,7 @@
 static struct exclude *included_patterns;
 /* Short options.  */
 static char const short_options[] =
-"0123456789A:B:C:D:EFGHIPUVX:abcd:e:f:hiKLlm:noqRrsuvwxyZz";
+"0123456789A:B:C:D:EFGHIPTUVX:abcd:e:f:hiKLlm:noqRrsuvwxyZz";
 
 /* Non-boolean long options that have no corresponding short equivalents.  */
 enum
@@ -309,6 +312,7 @@
   {"help", no_argument, &show_help, 1},
   {"include", required_argument, NULL, INCLUDE_OPTION},
   {"ignore-case", no_argument, NULL, 'i'},
+  {"initial-tab", no_argument, NULL, 'T'},
   {"label", required_argument, NULL, LABEL_OPTION},
   {"line-buffered", no_argument, NULL, LINE_BUFFERED_OPTION},
   {"line-number", no_argument, NULL, 'n'},
@@ -1376,6 +1380,7 @@
   -L, --files-without-match print only names of FILEs containing no match\n\
   -l, --files-with-matches  print only names of FILEs containing matches\n\
   -c, --count               print only a count of matching lines per FILE\n\
+  -T, --initial-tab         make tabs line up (if needed)\n\
   -Z, --null                print 0 byte after FILE name\n"));
       printf (_("\
 \n\
@@ -1758,6 +1763,10 @@
 	binary_files = WITHOUT_MATCH_BINARY_FILES;
 	break;
 
+      case 'T':
+	align_tabs = 1;
+	break;
+
       case 'U':
 #if defined(HAVE_DOS_FILE_CONTENTS)
 	dos_use_file_type = DOS_BINARY;



From MAILER-DAEMON Tue Jun 21 11:47:27 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkkyD-00018q-I3
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 11:47:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dkky6-00015a-QF
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:47:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dkky4-000144-8e
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:47:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dkky3-000134-Um
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:47:16 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkl01-0002e7-W1
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:49:18 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkkwP-0000p9-Ob
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:45:33 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1Dkkzz-0002dd-5E
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:49:15 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkkzz-0002da-0Q
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:49:15 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1Dkkx5-00026m-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 11:46:15 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1Dkkx5-00026m-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 11:46:15 -0400
Cc: 
Subject: Changes to grep/src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 15:47:22 -0000

Index: grep/src/grep.c
diff -u grep/src/grep.c:1.107 grep/src/grep.c:1.108
--- grep/src/grep.c:1.107	Tue Jun 21 15:22:58 2005
+++ grep/src/grep.c	Tue Jun 21 15:46:13 2005
@@ -695,30 +695,48 @@
   PR_SGR_END_IF(sep_color);
 }
 
-/* Print a byte offset, followed by a character separator.  */
+/* Print a line number or a byte offset.  */
 static void
-print_offset_sep (uintmax_t pos, char sep)
+print_offset (uintmax_t pos, int min_width, const char *color)
 {
   /* Do not rely on printf to print pos, since uintmax_t may be longer
      than long, and long long is not portable.  */
 
   char buf[sizeof pos * CHAR_BIT];
-  char *p = buf + sizeof buf - 1;
-  *p = sep;
+  char *p = buf + sizeof buf;
 
   do
-    *--p = '0' + pos % 10;
+    {
+      *--p = '0' + pos % 10;
+      --min_width;
+    }
   while ((pos /= 10) != 0);
 
+  /* Do this to maximize the probability of alignment across lines.  */
+  if (align_tabs)
+    while (--min_width >= 0)
+      *--p = ' ';
+
+  PR_SGR_START_IF(color);
   fwrite (p, 1, buf + sizeof buf - p, stdout);
+  PR_SGR_END_IF(color);
 }
 
 /* Print a whole line head (filename, line, byte).  */
 static void
 print_line_head (char const *beg, char const *lim, int sep)
 {
+  int pending_sep = 0;
+
   if (out_file)
-    printf ("%s%c", filename, sep & filename_mask);
+    {
+      print_filename();
+      if (filename_mask)
+	pending_sep = 1;
+      else
+	fputc(0, stdout);
+    }
+
   if (out_line)
     {
       if (lastnl < lim)
@@ -727,15 +745,34 @@
 	  totalnl = add_count (totalnl, 1);
 	  lastnl = lim;
 	}
-      print_offset_sep (totalnl, sep);
+      if (pending_sep)
+	print_sep(sep);
+      print_offset (totalnl, 4, line_num_color);
+      pending_sep = 1;
     }
+
   if (out_byte)
     {
       uintmax_t pos = add_count (totalcc, beg - bufbeg);
 #if defined(HAVE_DOS_FILE_CONTENTS)
       pos = dossified_pos (pos);
 #endif
-      print_offset_sep (pos, sep);
+      if (pending_sep)
+	print_sep(sep);
+      print_offset (pos, 6, byte_num_color);
+      pending_sep = 1;
+    }
+
+  if (pending_sep)
+    {
+      /* This assumes sep is one column wide.
+	 Try doing this any other way with Unicode
+	 (and its combining and wide characters)
+	 filenames and you're wasting your efforts.  */
+      if (align_tabs)
+	fputs("\t\b", stdout);
+
+      print_sep(sep);
     }
 }
 



From MAILER-DAEMON Tue Jun 21 11:47:32 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkkyH-0001AP-6l
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 11:47:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dkky8-00016A-Td
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:47:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dkky5-00014D-3b
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:47:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dkky2-000134-Dj
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:47:15 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkl02-0002eH-5o
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:49:18 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkkwP-0000p9-Vv
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:45:34 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1Dkkzx-0002dM-St
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:49:14 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkkzx-0002dJ-Ni
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:49:13 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1Dkkx4-00026d-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 11:46:14 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1Dkkx4-00026d-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 11:46:14 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 15:47:22 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.256 grep/ChangeLog:1.257
--- grep/ChangeLog:1.256	Tue Jun 21 15:22:57 2005
+++ grep/ChangeLog	Tue Jun 21 15:46:13 2005
@@ -47,6 +47,11 @@
 	  The option name/calling convention is the same as for GNU diff.
 	* doc/grep.texi, doc/grep.1: Document -T/--initial-tab.
 
+	* src/grep.c (print_offset): Renamed print_offset_sep() to better
+	  represents its new functionality; new calling convention.
+	* src/grep.c (print_offset, print_line_head): Use and implement
+	  missing parts of the GREP_COLORS and -T/--initial-tab frameworks.
+
 2005-06-20  Charles Levert  <charles_levert@gna.org>
 
 	* src/grep.c: Extensively document the SGR/EL-to-Right issue.



From MAILER-DAEMON Tue Jun 21 11:47:35 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkkyN-0001BU-0t
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 11:47:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DkkyD-00018m-6W
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:47:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dkky9-000172-7B
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:47:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dkky8-000134-SQ
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:47:20 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkkwV-0002Gt-TE
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:45:39 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dkkst-0000ga-NP
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:41:55 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkksB-0001mh-Ot
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:41:12 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkksB-0001lT-DQ
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:41:11 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkkaY-0000KE-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 11:22:58 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkkaY-0000KE-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 11:22:58 -0400
Cc: 
Subject: Changes to grep/doc/grep.texi
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 15:47:26 -0000

Index: grep/doc/grep.texi
diff -u grep/doc/grep.texi:1.53 grep/doc/grep.texi:1.54
--- grep/doc/grep.texi:1.53	Tue Jun 21 14:58:50 2005
+++ grep/doc/grep.texi	Tue Jun 21 15:22:58 2005
@@ -523,6 +523,22 @@
 behavior (including core dumps) if an input file shrinks while
 @command{grep} is operating, or if an I/O error occurs.
 
+@item -T
+@itemx --initial-tab
+@opindex -T
+@opindex --initial-tab
+@cindex tab-aligned content lines
+Makes sure that the first character of actual line content lies on a
+tab stop, so that the alignment of tabs looks normal.
+This is useful when combined with @samp{-H} (which is implicit when
+there is more than one file to search), @samp{-n}, and @samp{-b};
+these options prepend their output at the beginning of the displayed
+line, before the actual content.
+In order to improve the probability that all matched or context lines
+from a single file will all start at the same column, this also causes
+the line number and octet offset (if present) to be printed in a minimum
+size field width.
+
 @item -Z
 @itemx --null
 @opindex -Z



From MAILER-DAEMON Tue Jun 21 11:47:36 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkkyN-0001C0-IP
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 11:47:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DkkyD-00018d-Ea
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:47:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dkky8-00016N-Tf
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:47:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dkky7-000134-CH
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:47:19 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkkwW-0002H5-Vc
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:45:41 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dkksu-0000ga-Qh
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 11:41:56 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1Dkks9-0001mN-UG
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 11:41:10 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkks9-0001lT-N8
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 11:41:09 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkkaZ-0000KM-00
	for <grep-cvs-logs@gnu.org>; Tue, 21 Jun 2005 11:22:59 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkkaZ-0000KM-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 11:22:59 -0400
Cc: 
Subject: grep ./ChangeLog src/grep.c doc/grep.texi doc/g...
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 15:47:27 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/06/21 15:22:58

Modified files:
	.              : ChangeLog 
	src            : grep.c 
	doc            : grep.texi grep.1 

Log message:
	* src/grep.c: The new -T/--initial-tab framework, only
	partially used at this point to make for a simpler initial
	patch in CVS.  A subset of patch #3644 on Savannah.
	The option name/calling convention is the same as for GNU diff.
	* doc/grep.texi, doc/grep.1: Document -T/--initial-tab.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.255&tr2=1.256&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/grep.c.diff?tr1=1.106&tr2=1.107&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/doc/grep.texi.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/doc/grep.1.diff?tr1=1.30&tr2=1.31&r1=text&r2=text




From MAILER-DAEMON Tue Jun 21 11:47:27 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DkkyF-00019q-Fs
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 11:47:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dkky6-00015Z-Pw
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:47:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dkky4-00014V-US
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:47:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dkky4-000134-A1
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:47:16 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkl01-0002e1-Ov
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:49:17 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkkwP-0000p9-Hy
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 11:45:33 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1Dkl00-0002do-6Y
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 11:49:16 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkl00-0002dl-1m
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 11:49:16 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1Dkkx6-00026t-00
	for <grep-cvs-logs@gnu.org>; Tue, 21 Jun 2005 11:46:16 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1Dkkx6-00026t-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 11:46:16 -0400
Cc: 
Subject: grep ./ChangeLog src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 15:47:22 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/06/21 15:46:13

Modified files:
	.              : ChangeLog 
	src            : grep.c 

Log message:
	* src/grep.c (print_offset): Renamed print_offset_sep() to better
	represent its new functionality; new calling convention.
	* src/grep.c (print_offset, print_line_head): Use and implement
	missing parts of the GREP_COLORS and -T/--initial-tab frameworks.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.256&tr2=1.257&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/grep.c.diff?tr1=1.107&tr2=1.108&r1=text&r2=text




From MAILER-DAEMON Tue Jun 21 11:56:05 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Dkl6a-0004sr-NR
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 11:56:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dkl6V-0004nX-1H
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:55:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dkl6Q-0004kz-Vv
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:55:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dkl6Q-0004jt-6J
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:55:54 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkl84-0003m7-2n
	for grep-commit@gnu.org; Tue, 21 Jun 2005 11:57:36 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dkl4R-00015K-Ou
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:53:51 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1Dkl82-0003lw-HV
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:57:34 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkl82-0003lt-DE
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 11:57:34 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1Dkl59-0003Eu-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 11:54:35 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1Dkl59-0003Eu-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 11:54:35 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 15:56:02 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.257 grep/ChangeLog:1.258
--- grep/ChangeLog:1.257	Tue Jun 21 15:46:13 2005
+++ grep/ChangeLog	Tue Jun 21 15:54:35 2005
@@ -48,10 +48,14 @@
 	* doc/grep.texi, doc/grep.1: Document -T/--initial-tab.
 
 	* src/grep.c (print_offset): Renamed print_offset_sep() to better
-	  represents its new functionality; new calling convention.
+	  represent its new functionality; new calling convention.
 	* src/grep.c (print_offset, print_line_head): Use and implement
 	  missing parts of the GREP_COLORS and -T/--initial-tab frameworks.
 
+	* src/grep.c (print_line_middle, print_line_tail): New functions,
+	  unused for now, intended to allow a simplifying rewrite of
+	  prline().  Adding them first will make for cleaner CVS patches.
+
 2005-06-20  Charles Levert  <charles_levert@gna.org>
 
 	* src/grep.c: Extensively document the SGR/EL-to-Right issue.



From MAILER-DAEMON Tue Jun 21 12:40:23 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Dkln5-0006pi-SH
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 12:39:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dklmp-0006iC-2V
	for grep-commit@gnu.org; Tue, 21 Jun 2005 12:39:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dklmf-0006bs-JO
	for grep-commit@gnu.org; Tue, 21 Jun 2005 12:39:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dklme-0006Z0-N9
	for grep-commit@gnu.org; Tue, 21 Jun 2005 12:39:32 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DklkD-0006ff-A9
	for grep-commit@gnu.org; Tue, 21 Jun 2005 12:37:01 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dklga-00029G-Ek
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 12:33:16 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DklP2-0005Mg-P0
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 12:15:09 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DklP2-0005LV-Jh
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 12:15:08 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1Dkl5A-0003F1-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 11:54:36 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1Dkl5A-0003F1-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 11:54:36 -0400
Cc: 
Subject: Changes to grep/src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 16:39:48 -0000

Index: grep/src/grep.c
diff -u grep/src/grep.c:1.108 grep/src/grep.c:1.109
--- grep/src/grep.c:1.108	Tue Jun 21 15:46:13 2005
+++ grep/src/grep.c	Tue Jun 21 15:54:35 2005
@@ -776,6 +776,99 @@
     }
 }
 
+const char *
+print_line_middle (const char *beg, const char *lim)
+{
+  size_t match_size;
+  size_t match_offset;
+  char *buf;		/* XXX */
+  const char *ibeg;	/* XXX */
+
+  if (match_icase)	/* XXX - None of the -i stuff should be here.  */
+    {
+      int i = lim - beg;
+
+      ibeg = buf = (char *) xmalloc(i);
+      /* This can't possibly be correct with UTF-8,
+	 but it's equivalent to what was there so far.  */
+      while (--i >= 0)
+	buf[i] = tolower(beg[i]);
+    }
+  else
+    {
+      buf = NULL;
+      ibeg = beg;
+    }
+
+  while (   lim > beg
+	 && (   (match_offset = (*execute) (ibeg, lim - beg, &match_size, 1))
+	     != (size_t) -1))
+    {
+      char const *b = beg + match_offset;
+
+      /* Avoid matching the empty line at the end of the buffer. */
+      if (b == lim)
+	break;
+
+      /* Avoid hanging on grep --color "" foo */
+      if (match_size == 0)
+	break;
+
+      if (only_matching)
+	print_line_head(b, lim, SEP_CHAR_MATCH);
+      else
+	{
+	  if (pseudo_markup >= 0)
+	    {
+	      PR_SGR_START(mlines_color);
+	      if (pseudo_markup)
+		pseudo_markup = -1;
+	    }
+	  fwrite (beg, sizeof (char), match_offset, stdout);
+	}
+
+      PR_SGR_START_IF(grep_color);
+      fwrite (b, sizeof (char), match_size, stdout);
+      PR_SGR_END_IF(grep_color);
+      if (only_matching)
+	fputs("\n", stdout);
+      beg = b + match_size;
+      ibeg += match_offset + match_size;	/* XXX */
+    }
+
+  if (buf)
+    free(buf);	/* XXX */
+
+  if (only_matching)
+    beg = lim;
+
+  return beg;
+}
+
+const char *
+print_line_tail (const char *beg, const char *lim, const char *color)
+{
+  size_t  eol_size;
+  size_t tail_size;
+
+  eol_size   = (lim > beg && lim[-1] == eolbyte);
+  eol_size  += (lim - eol_size > beg && lim[-(1 + eol_size)] == '\r');
+  tail_size  =  lim - eol_size - beg;
+
+  if (tail_size > 0)
+    {
+      if (pseudo_markup >= 0)
+	PR_SGR_START(color);
+      fwrite(beg, 1, tail_size, stdout);
+      beg += tail_size;
+    }
+
+  if (tail_size > 0 || pseudo_markup < 0)
+    PR_SGR_END(color);
+
+  return beg;
+}
+
 static void
 prline (char const *beg, char const *lim, int sep)
 {



From MAILER-DAEMON Tue Jun 21 12:40:38 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Dkln0-0006nI-EV
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 12:39:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dklmn-0006hM-Nb
	for grep-commit@gnu.org; Tue, 21 Jun 2005 12:39:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dklmh-0006dM-Gu
	for grep-commit@gnu.org; Tue, 21 Jun 2005 12:39:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dklmh-0006Z0-AU
	for grep-commit@gnu.org; Tue, 21 Jun 2005 12:39:35 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkliH-0006XP-Un
	for grep-commit@gnu.org; Tue, 21 Jun 2005 12:35:02 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dklef-0001uv-1Q
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 12:31:17 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DklhI-0006TK-GH
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 12:34:00 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DklhI-0006Sq-AB
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 12:34:00 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DklPf-0005OJ-00
	for <grep-cvs-logs@gnu.org>; Tue, 21 Jun 2005 12:15:47 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DklPf-0005OJ-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 12:15:48 -0400
Cc: 
Subject: grep ./ChangeLog src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 16:39:45 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/06/21 16:15:47

Modified files:
	.              : ChangeLog 
	src            : grep.c 

Log message:
	* src/grep.c (prline): Simplifying rewrite using
	print_line_middle() and print_line_tail().  No longer attempts
	to find matches to colorize in context lines, thus avoiding
	costly calls to (*execute)(), since we know by then that they
	can't contain any by definition.  There are no longer four
	different code paths whether -o and -i are each specified
	or not; they have been unified into one, which should help
	avoid bugs similar to previous ones due to not updating all
	code paths in a synchronized fashion.  The -i code has been
	explicitly marked since it doesn't belong there and should
	be removed as soon as other -i code elsewhere is fixed.
	The remaining GREP_COLORS functionality is implemented.
	Savannah patch #3771 and patch #3644, heavily reworked.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.258&tr2=1.259&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/grep.c.diff?tr1=1.109&tr2=1.110&r1=text&r2=text




From MAILER-DAEMON Tue Jun 21 12:40:49 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Dkln3-0006o8-DY
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 12:39:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dklmo-0006hr-OJ
	for grep-commit@gnu.org; Tue, 21 Jun 2005 12:39:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dklmi-0006dg-BJ
	for grep-commit@gnu.org; Tue, 21 Jun 2005 12:39:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dklmh-0006Z0-I9
	for grep-commit@gnu.org; Tue, 21 Jun 2005 12:39:35 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkliH-0006XJ-MU
	for grep-commit@gnu.org; Tue, 21 Jun 2005 12:35:01 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dklee-0001uv-PL
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 12:31:16 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DklhJ-0006TT-3t
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 12:34:01 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DklhI-0006Sq-Pj
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 12:34:00 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DklPf-0005OG-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 12:15:47 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DklPf-0005OG-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 12:15:47 -0400
Cc: 
Subject: Changes to grep/src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 16:39:46 -0000

Index: grep/src/grep.c
diff -u grep/src/grep.c:1.109 grep/src/grep.c:1.110
--- grep/src/grep.c:1.109	Tue Jun 21 15:54:35 2005
+++ grep/src/grep.c	Tue Jun 21 16:15:47 2005
@@ -872,117 +872,37 @@
 static void
 prline (char const *beg, char const *lim, int sep)
 {
+  const char *line_color;
+
   if (!only_matching)
     print_line_head(beg, lim, sep);
-  else
-    {
-      size_t match_size;
-      size_t match_offset;
-      if(match_icase)
-        {
-          char *buf = (char*) xmalloc (lim - beg);
-	  char *ibeg = buf;
-	  char *ilim = ibeg + (lim - beg);
-	  int i;
-	  for (i = 0; i < lim - beg; i++)
-	    ibeg[i] = tolower (beg[i]);
 
-	  while ((match_offset = (*execute) (ibeg, ilim - ibeg, &match_size, 1))
-		 != (size_t) -1)
-	    {
-	      char const *b = beg + match_offset;
-	      if (b == lim)
-		break;
-	      if (match_size == 0)
-		break;
-	      print_line_head(b, lim, sep);
-	      PR_SGR_START_IF(grep_color);
-	      fwrite(b, sizeof (char), match_size, stdout);
-	      PR_SGR_END_IF(grep_color);
-	      fputs("\n", stdout);
-	      beg = b + match_size;
-	      ibeg += match_offset + match_size;
-	    }
-	  free (buf);
-	  lastout = lim;
-	  if(line_buffered)
-	    fflush(stdout);
-	  return;
-	}
-      while ((match_offset = (*execute) (beg, lim - beg, &match_size, 1))
-	  != (size_t) -1)
-        {
-	  char const *b = beg + match_offset;
-	  if (b == lim)
-	    break;
-	  if (match_size == 0)
-	    break;
-	  print_line_head(b, lim, sep);
-	  PR_SGR_START_IF(grep_color);
-	  fwrite(b, sizeof (char), match_size, stdout);
-	  PR_SGR_END_IF(grep_color);
-	  fputs("\n", stdout);
-	  beg = b + match_size;
-        }
-      lastout = lim;
-      if(line_buffered)
-	fflush(stdout);
-      return;
-    }
   if (color_option)
+    line_color = ((sep == SEP_CHAR_MATCH) ? mlines_color : context_color);
+
+  if (only_matching || (color_option && (*grep_color || *line_color)))
     {
-      size_t match_size;
-      size_t match_offset;
-      if(match_icase)
-        {
-	  /* Yuck, this is tricky */
-          char *buf = (char*) xmalloc (lim - beg);
-	  char *ibeg = buf;
-	  char *ilim = ibeg + (lim - beg);
-	  int i;
-	  for (i = 0; i < lim - beg; i++)
-	    ibeg[i] = tolower (beg[i]);
-	  while ((match_offset = (*execute) (ibeg, ilim-ibeg, &match_size, 1))
-		 != (size_t) -1)
-	    {
-	      char const *b = beg + match_offset;
-	      if (b == lim)
-		break;
-	      if (match_size == 0)
-	        break;
-	      fwrite (beg, sizeof (char), match_offset, stdout);
-	      PR_SGR_START(grep_color);
-	      fwrite (b, sizeof (char), match_size, stdout);
-	      PR_SGR_END(grep_color);
-	      beg = b + match_size;
-	      ibeg = ibeg + match_offset + match_size;
-	    }
-	  fwrite (beg, 1, lim - beg, stdout);
-	  free (buf);
-	  lastout = lim;
-	  return;
-	}
-      while (lim-beg && (match_offset = (*execute) (beg, lim - beg, &match_size, 1))
-	     != (size_t) -1)
-	{
-	  char const *b = beg + match_offset;
-	  /* Avoid matching the empty line at the end of the buffer. */
-	  if (b == lim)
-	    break;
-	  /* Avoid hanging on grep --color "" foo */
-	  if (match_size == 0)
-	    break;
-	  fwrite (beg, sizeof (char), match_offset, stdout);
-	  PR_SGR_START(grep_color);
-	  fwrite (b, sizeof (char), match_size, stdout);
-	  PR_SGR_END(grep_color);
-	  beg = b + match_size;
-	}
+      /* We already know that context lines have no match (to colorize).  */
+      if (only_matching || (*grep_color && sep == SEP_CHAR_MATCH))
+	beg = print_line_middle(beg, lim);
+
+      if (!only_matching && *line_color);
+	beg = print_line_tail(beg, lim, line_color);
+
+      /* This global is modified by print_line_middle()
+	 and checked by print_line_tail().  Now reset it.  */
+      if (pseudo_markup < 0)
+	pseudo_markup = 1;
     }
-  fwrite (beg, 1, lim - beg, stdout);
+
+  if (!only_matching && lim > beg)
+    fwrite (beg, 1, lim - beg, stdout);
+
   if (ferror (stdout))
     error (0, errno, _("writing output"));
+
   lastout = lim;
+
   if (line_buffered)
     fflush (stdout);
 }



From MAILER-DAEMON Tue Jun 21 12:41:17 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Dkln7-0006qc-Jh
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 12:40:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dklmt-0006k1-Ok
	for grep-commit@gnu.org; Tue, 21 Jun 2005 12:39:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dklmk-0006dt-Qc
	for grep-commit@gnu.org; Tue, 21 Jun 2005 12:39:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dklmi-0006Z0-0f
	for grep-commit@gnu.org; Tue, 21 Jun 2005 12:39:36 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkliH-0006X8-Cv
	for grep-commit@gnu.org; Tue, 21 Jun 2005 12:35:01 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dklee-0001uv-Hq
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 12:31:16 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DklhJ-0006Tc-Dp
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 12:34:01 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DklhJ-0006Sq-9c
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 12:34:01 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DklPf-0005OC-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 12:15:47 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DklPf-0005OC-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 12:15:47 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 16:39:51 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.258 grep/ChangeLog:1.259
--- grep/ChangeLog:1.258	Tue Jun 21 15:54:35 2005
+++ grep/ChangeLog	Tue Jun 21 16:15:47 2005
@@ -56,6 +56,20 @@
 	  unused for now, intended to allow a simplifying rewrite of
 	  prline().  Adding them first will make for cleaner CVS patches.
 
+	* src/grep.c (prline): Simplifying rewrite using
+	  print_line_middle() and print_line_tail().  No longer attempts
+	  to find matches to colorize in context lines, thus avoiding
+	  costly calls to (*execute)(), since we know by then that they
+	  can't contain any by definition.  There are no longer four
+	  different code paths whether -o and -i are each specified
+	  or not; they have been unified into one, which should help
+	  avoid bugs similar to previous ones due to not updating all
+	  code paths in a synchronized fashion.  The -i code has been
+	  explicitly marked since it doesn't belong there and should
+	  be removed as soon as other -i code elsewhere is fixed.
+	  The remaining GREP_COLORS functionality is implemented.
+	  Savannah patch #3771 and patch #3644, heavily reworked.
+
 2005-06-20  Charles Levert  <charles_levert@gna.org>
 
 	* src/grep.c: Extensively document the SGR/EL-to-Right issue.



From MAILER-DAEMON Tue Jun 21 12:41:58 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Dkln8-0006r3-3e
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 12:40:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dklmr-0006iF-Pt
	for grep-commit@gnu.org; Tue, 21 Jun 2005 12:39:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dklmf-0006bi-W7
	for grep-commit@gnu.org; Tue, 21 Jun 2005 12:39:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dklme-0006Z0-CH
	for grep-commit@gnu.org; Tue, 21 Jun 2005 12:39:32 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DklkD-0006fn-M7
	for grep-commit@gnu.org; Tue, 21 Jun 2005 12:37:01 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dklga-00029G-L7
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 12:33:16 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DklP2-0005MX-IP
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 12:15:08 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DklP2-0005LV-F9
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 12:15:08 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1Dkl5A-0003FC-00
	for <grep-cvs-logs@gnu.org>; Tue, 21 Jun 2005 11:54:36 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1Dkl5A-0003FC-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 11:54:36 -0400
Cc: 
Subject: grep ./ChangeLog src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Jun 2005 16:39:52 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/06/21 15:54:35

Modified files:
	.              : ChangeLog 
	src            : grep.c 

Log message:
	* src/grep.c (print_line_middle, print_line_tail): New functions,
	unused for now, intended to allow a simplifying rewrite of
	prline().  Adding them first will make for cleaner CVS patches.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.257&tr2=1.258&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/grep.c.diff?tr1=1.108&tr2=1.109&r1=text&r2=text




From MAILER-DAEMON Tue Jun 21 22:11:09 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Dkuho-00058k-KQ
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 22:11:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dkuhj-00056a-VV
	for grep-commit@gnu.org; Tue, 21 Jun 2005 22:11:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dkuhe-00053i-ML
	for grep-commit@gnu.org; Tue, 21 Jun 2005 22:11:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dkuhe-00052u-0u
	for grep-commit@gnu.org; Tue, 21 Jun 2005 22:10:58 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkuh8-0006zB-Nn
	for grep-commit@gnu.org; Tue, 21 Jun 2005 22:10:26 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkudN-00043a-Lj
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 22:06:33 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1Dkuh1-0006yu-VI
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 22:10:20 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dkuh1-0006yr-RJ
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 22:10:19 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkuL9-000555-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 21:47:43 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkuL9-000555-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 21:47:43 -0400
Cc: 
Subject: Changes to grep/src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Jun 2005 02:11:05 -0000

Index: grep/src/grep.c
diff -u grep/src/grep.c:1.110 grep/src/grep.c:1.111
--- grep/src/grep.c:1.110	Tue Jun 21 16:15:47 2005
+++ grep/src/grep.c	Wed Jun 22 01:47:43 2005
@@ -221,7 +221,7 @@
     const char *(*fct)(void);
   };
 
-const char *
+static const char *
 color_cap_ne_fct(void)
 {
   if (pseudo_markup)
@@ -233,7 +233,7 @@
   return NULL;
 }
 
-const char *
+static const char *
 color_cap_xm_fct(void)
 {
   /* This experimental feature should stay undocumented for now.  */
@@ -776,7 +776,7 @@
     }
 }
 
-const char *
+static const char *
 print_line_middle (const char *beg, const char *lim)
 {
   size_t match_size;
@@ -845,7 +845,7 @@
   return beg;
 }
 
-const char *
+static const char *
 print_line_tail (const char *beg, const char *lim, const char *color)
 {
   size_t  eol_size;



From MAILER-DAEMON Tue Jun 21 22:11:10 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Dkuhp-00059G-Lp
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 22:11:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dkuhm-00057v-Fe
	for grep-commit@gnu.org; Tue, 21 Jun 2005 22:11:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dkuhi-00055v-Me
	for grep-commit@gnu.org; Tue, 21 Jun 2005 22:11:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dkuhi-00052u-BQ
	for grep-commit@gnu.org; Tue, 21 Jun 2005 22:11:02 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkuZa-0006g4-H6
	for grep-commit@gnu.org; Tue, 21 Jun 2005 22:02:38 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkuVp-0003ru-Jj
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 21:58:45 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkuO9-00068c-6h
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 21:50:49 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkuO9-000688-1B
	for grep-cvs-logs@gnu.org; Tue, 21 Jun 2005 21:50:49 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkuLA-00055E-00
	for <grep-cvs-logs@gnu.org>; Tue, 21 Jun 2005 21:47:44 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkuLA-00055E-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 21:47:44 -0400
Cc: 
Subject: grep ./ChangeLog src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Jun 2005 02:11:08 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/06/22 01:47:43

Modified files:
	.              : ChangeLog 
	src            : grep.c 

Log message:
	* src/grep.c (color_cap_ne_fct, color_cap_xm_fct,
	print_line_middle, print_line_tail): Make these four functions static.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.259&tr2=1.260&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/grep.c.diff?tr1=1.110&tr2=1.111&r1=text&r2=text




From MAILER-DAEMON Tue Jun 21 22:11:11 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Dkuhr-00059r-Hm
	for mharc-grep-commit@gnu.org; Tue, 21 Jun 2005 22:11:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dkuhm-00057r-Ub
	for grep-commit@gnu.org; Tue, 21 Jun 2005 22:11:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dkuhi-00055s-NL
	for grep-commit@gnu.org; Tue, 21 Jun 2005 22:11:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dkuhh-00052u-85
	for grep-commit@gnu.org; Tue, 21 Jun 2005 22:11:01 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkuZe-0006gG-4Y
	for grep-commit@gnu.org; Tue, 21 Jun 2005 22:02:42 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DkuVt-0003ru-5h
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 21:58:49 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DkuO8-00068U-UM
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 21:50:49 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DkuO8-000688-Ow
	for grep-cvs-diffs@gnu.org; Tue, 21 Jun 2005 21:50:48 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DkuL9-00054x-00
	for <grep-cvs-diffs@gnu.org>; Tue, 21 Jun 2005 21:47:43 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DkuL9-00054x-00@savannah.gnu.org>
Date: Tue, 21 Jun 2005 21:47:43 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Jun 2005 02:11:09 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.259 grep/ChangeLog:1.260
--- grep/ChangeLog:1.259	Tue Jun 21 16:15:47 2005
+++ grep/ChangeLog	Wed Jun 22 01:47:42 2005
@@ -70,6 +70,10 @@
 	  The remaining GREP_COLORS functionality is implemented.
 	  Savannah patch #3771 and patch #3644, heavily reworked.
 
+	* src/grep.c (color_cap_ne_fct, color_cap_xm_fct,
+	  print_line_middle, print_line_tail): Make these four functions
+	  static.
+
 2005-06-20  Charles Levert  <charles_levert@gna.org>
 
 	* src/grep.c: Extensively document the SGR/EL-to-Right issue.



From MAILER-DAEMON Wed Jun 22 21:08:52 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DlGD5-0002PH-V6
	for mharc-grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DlGCz-0002M9-Hl
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DlGCr-0002I7-1Z
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DlGCq-0002Fx-V8
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:36 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG5A-0004ci-8p
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:00:40 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DlG15-0008BW-LV
	for grep-cvs-logs@gnu.org; Wed, 22 Jun 2005 20:56:27 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DlG52-0004XK-Gj
	for grep-cvs-logs@gnu.org; Wed, 22 Jun 2005 21:00:32 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG52-0004X0-7h
	for grep-cvs-logs@gnu.org; Wed, 22 Jun 2005 21:00:32 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DlG0o-0000fb-00
	for <grep-cvs-logs@gnu.org>; Wed, 22 Jun 2005 20:56:10 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DlG0o-0000fb-00@savannah.gnu.org>
Date: Wed, 22 Jun 2005 20:56:10 -0400
Cc: 
Subject: grep ./ChangeLog ./autogen.sh src/Makefile.am t...
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jun 2005 01:08:48 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/06/23 00:55:58

Modified files:
	.              : ChangeLog autogen.sh 
	src            : Makefile.am 
	tests          : backref.sh bre.sh empty.sh ere.sh file.sh 
	                 fmbtest.sh foad1.sh khadafy.sh options.sh 
	                 spencer1.sh spencer2.sh status.sh warning.sh 

Log message:
	* grep/autogen.sh, grep/src/Makefile.am, grep/tests/backref.sh,
	grep/tests/bre.sh, grep/tests/empty.sh, grep/tests/ere.sh,
	grep/tests/file.sh, grep/tests/fmbtest.sh, grep/tests/foad1.sh,
	grep/tests/khadafy.sh, grep/tests/options.sh,
	grep/tests/spencer1.sh, grep/tests/spencer2.sh,
	grep/tests/status.sh, grep/tests/warning.sh: As per autoconf's
	"Portable Shell Programming" guidelines, replace all instances
	of "#!/bin/sh" by "#! /bin/sh" (notice the space).

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.260&tr2=1.261&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/autogen.sh.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/Makefile.am.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/tests/backref.sh.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/tests/bre.sh.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/tests/empty.sh.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/tests/ere.sh.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/tests/file.sh.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/tests/fmbtest.sh.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/tests/foad1.sh.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/tests/khadafy.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/tests/options.sh.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/tests/spencer1.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/tests/spencer2.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/tests/status.sh.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/tests/warning.sh.diff?tr1=1.7&tr2=1.8&r1=text&r2=text




From MAILER-DAEMON Wed Jun 22 21:08:53 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DlGD6-0002PO-Mv
	for mharc-grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DlGCy-0002LC-Fi
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DlGCn-0002G0-D4
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DlGCn-0002Fx-9t
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:33 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG59-0004c6-10
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:00:39 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DlG14-0008B8-FB
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 20:56:26 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DlG54-0004Yu-VC
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:35 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG54-0004X0-Mz
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:34 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DlG0k-0000ew-00
	for <grep-cvs-diffs@gnu.org>; Wed, 22 Jun 2005 20:56:06 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DlG0k-0000ew-00@savannah.gnu.org>
Date: Wed, 22 Jun 2005 20:56:06 -0400
Cc: 
Subject: Changes to grep/tests/fmbtest.sh
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jun 2005 01:08:49 -0000

Index: grep/tests/fmbtest.sh
diff -u grep/tests/fmbtest.sh:1.2 grep/tests/fmbtest.sh:1.3
--- grep/tests/fmbtest.sh:1.2	Tue Jun 14 20:56:42 2005
+++ grep/tests/fmbtest.sh	Thu Jun 23 00:55:58 2005
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
 
 : ${srcdir=.}
 



From MAILER-DAEMON Wed Jun 22 21:08:53 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DlGD7-0002Pm-D2
	for mharc-grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DlGD0-0002Mk-Pg
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DlGCr-0002IG-Lf
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DlGCr-0002Fx-GW
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:37 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG58-0004bb-9s
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:00:38 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DlG13-0008B8-Nu
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 20:56:25 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DlG55-0004Zd-Pf
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:36 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG55-0004X0-HW
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:35 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DlG0g-0000ei-00
	for <grep-cvs-diffs@gnu.org>; Wed, 22 Jun 2005 20:56:02 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DlG0g-0000ei-00@savannah.gnu.org>
Date: Wed, 22 Jun 2005 20:56:02 -0400
Cc: 
Subject: Changes to grep/tests/empty.sh
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jun 2005 01:08:49 -0000

Index: grep/tests/empty.sh
diff -u grep/tests/empty.sh:1.8 grep/tests/empty.sh:1.9
--- grep/tests/empty.sh:1.8	Thu Jun  5 07:59:30 2003
+++ grep/tests/empty.sh	Thu Jun 23 00:55:58 2005
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
 # test that the empty file means no pattern
 # and an empty pattern means match all.
 



From MAILER-DAEMON Wed Jun 22 21:08:56 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DlGD9-0002QW-CD
	for mharc-grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DlGD1-0002Mo-1L
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DlGCu-0002J3-JO
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DlGCs-0002Fx-2a
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:38 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG57-0004bC-QC
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:00:37 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DlG13-0008B8-7y
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 20:56:25 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DlG56-0004aQ-SV
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:37 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG56-0004X0-KU
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:36 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DlG0e-0000eU-00
	for <grep-cvs-diffs@gnu.org>; Wed, 22 Jun 2005 20:56:00 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DlG0e-0000eU-00@savannah.gnu.org>
Date: Wed, 22 Jun 2005 20:56:00 -0400
Cc: 
Subject: Changes to grep/src/Makefile.am
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jun 2005 01:08:50 -0000

Index: grep/src/Makefile.am
diff -u grep/src/Makefile.am:1.32 grep/src/Makefile.am:1.33
--- grep/src/Makefile.am:1.32	Tue Nov 23 12:49:36 2004
+++ grep/src/Makefile.am	Thu Jun 23 00:55:58 2005
@@ -23,7 +23,7 @@
 OPTION_for_fgrep = -F
 
 egrep fgrep: Makefile
-	(echo '#!/bin/sh'; \
+	(echo '#! /bin/sh'; \
 	echo 'case $$0 in' ; \
 	echo '  */*) dir=$${0%/*}/ ;;' ; \
 	echo '  *) dir="" ;;' ; \



From MAILER-DAEMON Wed Jun 22 21:08:56 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DlGD9-0002Qc-Tv
	for mharc-grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DlGD0-0002Mp-Tm
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DlGCt-0002Jc-JA
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DlGCt-0002Fx-6w
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:39 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG57-0004af-64
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:00:37 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DlG12-0008B8-Js
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 20:56:24 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DlG55-0004ZN-KE
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:36 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG55-0004X0-63
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:35 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DlG0h-0000em-00
	for <grep-cvs-diffs@gnu.org>; Wed, 22 Jun 2005 20:56:03 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DlG0h-0000em-00@savannah.gnu.org>
Date: Wed, 22 Jun 2005 20:56:03 -0400
Cc: 
Subject: Changes to grep/tests/ere.sh
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jun 2005 01:08:50 -0000

Index: grep/tests/ere.sh
diff -u grep/tests/ere.sh:1.6 grep/tests/ere.sh:1.7
--- grep/tests/ere.sh:1.6	Thu Jun  5 07:59:30 2003
+++ grep/tests/ere.sh	Thu Jun 23 00:55:58 2005
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
 # Regression test for GNU grep.
 
 : ${srcdir=.}



From MAILER-DAEMON Wed Jun 22 21:09:00 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DlGDE-0002Rs-82
	for mharc-grep-commit@gnu.org; Wed, 22 Jun 2005 21:09:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DlGD0-0002Mn-Sa
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DlGCt-0002IL-VH
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DlGCr-0002Fx-3a
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:37 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG5A-0004cb-1n
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:00:40 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DlG15-0008BW-GX
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 20:56:27 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DlG53-0004Y6-QM
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:34 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG53-0004X0-IV
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:33 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DlG0m-0000fG-00
	for <grep-cvs-diffs@gnu.org>; Wed, 22 Jun 2005 20:56:08 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DlG0m-0000fG-00@savannah.gnu.org>
Date: Wed, 22 Jun 2005 20:56:08 -0400
Cc: 
Subject: Changes to grep/tests/spencer1.sh
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jun 2005 01:08:50 -0000

Index: grep/tests/spencer1.sh
diff -u grep/tests/spencer1.sh:1.7 grep/tests/spencer1.sh:1.8
--- grep/tests/spencer1.sh:1.7	Thu Jun  5 07:59:30 2003
+++ grep/tests/spencer1.sh	Thu Jun 23 00:55:58 2005
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
 # Regression test for GNU grep.
 
 : ${srcdir=.}



From MAILER-DAEMON Wed Jun 22 21:09:00 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DlGDE-0002S8-JP
	for mharc-grep-commit@gnu.org; Wed, 22 Jun 2005 21:09:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DlGD1-0002Mw-KE
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DlGCu-0002KS-JT
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DlGCu-0002Fx-2e
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:40 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG54-0004Yn-NC
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:00:34 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DlG10-00088e-3A
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 20:56:22 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DlG53-0004Xw-HP
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:33 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG53-0004X0-4e
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:33 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DlG0n-0000fM-00
	for <grep-cvs-diffs@gnu.org>; Wed, 22 Jun 2005 20:56:09 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DlG0n-0000fM-00@savannah.gnu.org>
Date: Wed, 22 Jun 2005 20:56:09 -0400
Cc: 
Subject: Changes to grep/tests/spencer2.sh
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jun 2005 01:08:51 -0000

Index: grep/tests/spencer2.sh
diff -u grep/tests/spencer2.sh:1.7 grep/tests/spencer2.sh:1.8
--- grep/tests/spencer2.sh:1.7	Tue Apr 12 17:21:51 2005
+++ grep/tests/spencer2.sh	Thu Jun 23 00:55:58 2005
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
 # Regression test for GNU grep.
 
 : ${srcdir=.}



From MAILER-DAEMON Wed Jun 22 21:09:00 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DlGDE-0002Rz-DV
	for mharc-grep-commit@gnu.org; Wed, 22 Jun 2005 21:09:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DlGD0-0002Mm-R4
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DlGCr-0002Ie-SU
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DlGCr-0002Fx-ML
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:37 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG58-0004bR-2a
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:00:38 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DlG13-0008B8-Gn
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 20:56:25 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DlG57-0004ah-67
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:37 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG56-0004X0-VU
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:37 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DlG0e-0000eQ-00
	for <grep-cvs-diffs@gnu.org>; Wed, 22 Jun 2005 20:56:00 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DlG0e-0000eQ-00@savannah.gnu.org>
Date: Wed, 22 Jun 2005 20:56:00 -0400
Cc: 
Subject: Changes to grep/autogen.sh
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jun 2005 01:08:51 -0000

Index: grep/autogen.sh
diff -u grep/autogen.sh:1.6 grep/autogen.sh:1.7
--- grep/autogen.sh:1.6	Sat Nov 20 14:46:18 2004
+++ grep/autogen.sh	Thu Jun 23 00:55:58 2005
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
 
 chmod +x tests/*.sh   # fix a bug in CVS
 



From MAILER-DAEMON Wed Jun 22 21:09:01 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DlGDE-0002SI-Pl
	for mharc-grep-commit@gnu.org; Wed, 22 Jun 2005 21:09:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DlGD2-0002Ny-Nd
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DlGCx-0002KY-IS
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DlGCu-0002Fx-7r
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:40 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG54-0004YL-7M
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:00:34 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DlG0z-00088e-Ck
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 20:56:21 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DlG52-0004Xc-RH
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:33 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG52-0004X0-Lm
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:32 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DlG0n-0000fQ-00
	for <grep-cvs-diffs@gnu.org>; Wed, 22 Jun 2005 20:56:09 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DlG0n-0000fQ-00@savannah.gnu.org>
Date: Wed, 22 Jun 2005 20:56:09 -0400
Cc: 
Subject: Changes to grep/tests/status.sh
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jun 2005 01:08:51 -0000

Index: grep/tests/status.sh
diff -u grep/tests/status.sh:1.9 grep/tests/status.sh:1.10
--- grep/tests/status.sh:1.9	Fri Jan  7 10:39:02 2005
+++ grep/tests/status.sh	Thu Jun 23 00:55:58 2005
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
 # Test for status code for GNU grep.
 # status code
 #  0 match found



From MAILER-DAEMON Wed Jun 22 21:09:01 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DlGDF-0002Sf-6s
	for mharc-grep-commit@gnu.org; Wed, 22 Jun 2005 21:09:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DlGD1-0002Mz-KC
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DlGCw-0002KB-7M
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DlGCt-0002Fx-P0
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:39 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG55-0004ZZ-O2
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:00:35 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DlG11-00088e-70
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 20:56:23 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DlG54-0004YS-IH
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:35 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG54-0004X0-3r
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:34 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DlG0l-0000f6-00
	for <grep-cvs-diffs@gnu.org>; Wed, 22 Jun 2005 20:56:07 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DlG0l-0000f6-00@savannah.gnu.org>
Date: Wed, 22 Jun 2005 20:56:07 -0400
Cc: 
Subject: Changes to grep/tests/khadafy.sh
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jun 2005 01:08:51 -0000

Index: grep/tests/khadafy.sh
diff -u grep/tests/khadafy.sh:1.7 grep/tests/khadafy.sh:1.8
--- grep/tests/khadafy.sh:1.7	Thu Jun  5 07:59:30 2003
+++ grep/tests/khadafy.sh	Thu Jun 23 00:55:58 2005
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
 # Regression test for GNU grep.
 
 : ${srcdir=.}



From MAILER-DAEMON Wed Jun 22 21:09:02 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DlGDF-0002T0-P4
	for mharc-grep-commit@gnu.org; Wed, 22 Jun 2005 21:09:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DlGD3-0002Ng-Cb
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DlGCw-0002Kl-7u
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DlGCu-0002Fx-CV
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:40 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG53-0004Xi-1d
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:00:33 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DlG0y-00088e-D7
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 20:56:20 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DlG52-0004X6-1O
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:32 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG51-0004X0-TS
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:31 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DlG0n-0000fW-00
	for <grep-cvs-diffs@gnu.org>; Wed, 22 Jun 2005 20:56:09 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DlG0n-0000fW-00@savannah.gnu.org>
Date: Wed, 22 Jun 2005 20:56:09 -0400
Cc: 
Subject: Changes to grep/tests/warning.sh
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jun 2005 01:08:51 -0000

Index: grep/tests/warning.sh
diff -u grep/tests/warning.sh:1.7 grep/tests/warning.sh:1.8
--- grep/tests/warning.sh:1.7	Fri Nov 19 13:51:29 2004
+++ grep/tests/warning.sh	Thu Jun 23 00:55:58 2005
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
 #
 # Tell them not to be alarmed.
 



From MAILER-DAEMON Wed Jun 22 21:08:53 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DlGD7-0002Pc-5L
	for mharc-grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DlGD1-0002Mu-1j
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DlGCt-0002IQ-2D
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DlGCr-0002Fx-9X
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:37 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG58-0004bu-Jn
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:00:38 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DlG14-0008B8-1C
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 20:56:26 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DlG57-0004av-KC
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:37 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG57-0004X0-8w
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:37 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DlG0c-0000eK-00
	for <grep-cvs-diffs@gnu.org>; Wed, 22 Jun 2005 20:55:58 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DlG0c-0000eK-00@savannah.gnu.org>
Date: Wed, 22 Jun 2005 20:55:58 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jun 2005 01:08:49 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.260 grep/ChangeLog:1.261
--- grep/ChangeLog:1.260	Wed Jun 22 01:47:42 2005
+++ grep/ChangeLog	Thu Jun 23 00:55:58 2005
@@ -1,3 +1,14 @@
+2005-06-22  Charles Levert  <charles_levert@gna.org>
+
+	* grep/autogen.sh, grep/src/Makefile.am, grep/tests/backref.sh,
+	  grep/tests/bre.sh, grep/tests/empty.sh, grep/tests/ere.sh,
+	  grep/tests/file.sh, grep/tests/fmbtest.sh, grep/tests/foad1.sh,
+	  grep/tests/khadafy.sh, grep/tests/options.sh,
+	  grep/tests/spencer1.sh, grep/tests/spencer2.sh,
+	  grep/tests/status.sh, grep/tests/warning.sh: As per autoconf's
+	  "Portable Shell Programming" guidelines, replace all instances
+	  of "#!/bin/sh" by "#! /bin/sh" (notice the space).
+
 2005-06-21  Charles Levert  <charles_levert@gna.org>
 
 	* src/grep.c (nlscan): Make this function more robust by removing



From MAILER-DAEMON Wed Jun 22 21:09:03 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DlGDG-0002TR-A0
	for mharc-grep-commit@gnu.org; Wed, 22 Jun 2005 21:09:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DlGD1-0002My-K0
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DlGCw-0002JO-71
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DlGCs-0002Fx-L7
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:38 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG57-0004b0-Iy
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:00:37 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DlG12-0008B8-Ut
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 20:56:25 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DlG56-0004a5-Fu
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:36 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG56-0004X0-7M
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:36 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DlG0f-0000ea-00
	for <grep-cvs-diffs@gnu.org>; Wed, 22 Jun 2005 20:56:01 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DlG0f-0000ea-00@savannah.gnu.org>
Date: Wed, 22 Jun 2005 20:56:01 -0400
Cc: 
Subject: Changes to grep/tests/backref.sh
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jun 2005 01:08:51 -0000

Index: grep/tests/backref.sh
diff -u grep/tests/backref.sh:1.5 grep/tests/backref.sh:1.6
--- grep/tests/backref.sh:1.5	Wed Feb 23 16:36:44 2005
+++ grep/tests/backref.sh	Thu Jun 23 00:55:58 2005
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
 # Test for backreferences and other things.
 #
 



From MAILER-DAEMON Wed Jun 22 21:09:03 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DlGDG-0002To-Pu
	for mharc-grep-commit@gnu.org; Wed, 22 Jun 2005 21:09:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DlGD1-0002NF-VR
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DlGCu-0002KM-JT
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DlGCt-0002Fx-Tl
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:39 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG55-0004ZC-ER
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:00:35 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DlG10-00088e-RE
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 20:56:22 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DlG54-0004YG-2m
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:34 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG53-0004X0-RI
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:33 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DlG0l-0000fC-00
	for <grep-cvs-diffs@gnu.org>; Wed, 22 Jun 2005 20:56:07 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DlG0l-0000fC-00@savannah.gnu.org>
Date: Wed, 22 Jun 2005 20:56:07 -0400
Cc: 
Subject: Changes to grep/tests/options.sh
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jun 2005 01:08:51 -0000

Index: grep/tests/options.sh
diff -u grep/tests/options.sh:1.6 grep/tests/options.sh:1.7
--- grep/tests/options.sh:1.6	Thu Jun  5 07:59:30 2003
+++ grep/tests/options.sh	Thu Jun 23 00:55:58 2005
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
 # Test for POSIX.2 options for grep
 #
 # grep [ -E| -F][ -c| -l| -q ][-insvx] -e pattern_list 



From MAILER-DAEMON Wed Jun 22 21:09:04 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DlGDH-0002UL-Dw
	for mharc-grep-commit@gnu.org; Wed, 22 Jun 2005 21:09:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DlGD1-0002NA-VP
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DlGCu-0002Jt-JT
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DlGCt-0002Fx-DZ
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:39 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG56-0004aG-Mu
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:00:36 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DlG12-00088e-3k
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 20:56:24 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DlG55-0004Z2-5v
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:35 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG54-0004X0-Ta
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:34 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DlG0k-0000eq-00
	for <grep-cvs-diffs@gnu.org>; Wed, 22 Jun 2005 20:56:06 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DlG0k-0000eq-00@savannah.gnu.org>
Date: Wed, 22 Jun 2005 20:56:06 -0400
Cc: 
Subject: Changes to grep/tests/file.sh
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jun 2005 01:08:51 -0000

Index: grep/tests/file.sh
diff -u grep/tests/file.sh:1.2 grep/tests/file.sh:1.3
--- grep/tests/file.sh:1.2	Mon Nov 19 13:23:29 2001
+++ grep/tests/file.sh	Thu Jun 23 00:55:58 2005
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
 # Test for POSIX.2 options for grep
 #
 # grep -E -f pattern_file file



From MAILER-DAEMON Wed Jun 22 21:09:01 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DlGDF-0002SU-1H
	for mharc-grep-commit@gnu.org; Wed, 22 Jun 2005 21:09:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DlGD1-0002N0-OD
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DlGCw-0002K2-75
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DlGCt-0002Fx-JZ
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:08:39 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG56-0004Zv-66
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:00:36 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DlG11-00088e-Kj
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 20:56:23 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DlG54-0004Yi-Qi
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:35 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG54-0004X0-Fd
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:34 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DlG0l-0000f2-00
	for <grep-cvs-diffs@gnu.org>; Wed, 22 Jun 2005 20:56:07 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DlG0l-0000f2-00@savannah.gnu.org>
Date: Wed, 22 Jun 2005 20:56:07 -0400
Cc: 
Subject: Changes to grep/tests/foad1.sh
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jun 2005 01:08:51 -0000

Index: grep/tests/foad1.sh
diff -u grep/tests/foad1.sh:1.10 grep/tests/foad1.sh:1.11
--- grep/tests/foad1.sh:1.10	Tue Jun 21 06:19:44 2005
+++ grep/tests/foad1.sh	Thu Jun 23 00:55:58 2005
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
 # Test various combinations of command-line options.
 # This set of tests was started by Julian Foad.
 



From MAILER-DAEMON Wed Jun 22 21:10:50 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DlGF0-00035O-3y
	for mharc-grep-commit@gnu.org; Wed, 22 Jun 2005 21:10:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DlGEy-00033l-TR
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:10:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DlGEy-00033B-CK
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:10:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DlGEy-000331-8l
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:10:48 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlGHS-0005ot-T5
	for grep-commit@gnu.org; Wed, 22 Jun 2005 21:13:22 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DlGDO-00006r-5u
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:09:10 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DlG56-0004Zn-6X
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:36 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DlG55-0004X0-Su
	for grep-cvs-diffs@gnu.org; Wed, 22 Jun 2005 21:00:35 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DlG0g-0000ee-00
	for <grep-cvs-diffs@gnu.org>; Wed, 22 Jun 2005 20:56:02 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DlG0g-0000ee-00@savannah.gnu.org>
Date: Wed, 22 Jun 2005 20:56:02 -0400
Cc: 
Subject: Changes to grep/tests/bre.sh
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Jun 2005 01:10:49 -0000

Index: grep/tests/bre.sh
diff -u grep/tests/bre.sh:1.6 grep/tests/bre.sh:1.7
--- grep/tests/bre.sh:1.6	Thu Jun  5 07:59:30 2003
+++ grep/tests/bre.sh	Thu Jun 23 00:55:58 2005
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
 # Regression test for GNU grep.
 
 : ${srcdir=.}



