From MAILER-DAEMON Wed Dec 08 09:29:06 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1Cc2oT-0001Bc-KA
	for mharc-grep-commit@gnu.org; Wed, 08 Dec 2004 09:29:05 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1Cc2oQ-0001Ag-RT
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:29:02 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1Cc2oP-00019Q-29
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:29:01 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1Cc2oO-000199-E2
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:29:00 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Cc2eM-0001FO-40
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:18:38 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Cc2aw-00047j-C9
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 09:15:06 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1Cc2eG-0001E8-JF
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 09:18:32 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Cc2eG-0001DA-BD
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 09:18:32 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Cc2eF-0007zS-V8
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 09:18:32 -0500
To: grep-cvs-diffs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1Cc2eG-0001E8-JF@monty-python.gnu.org>
Date: Wed, 08 Dec 2004 09:18:32 -0500
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: Wed, 08 Dec 2004 14:29:03 -0000

Index: grep/doc/grep.texi
diff -u grep/doc/grep.texi:1.47 grep/doc/grep.texi:1.48
--- grep/doc/grep.texi:1.47	Fri Nov 19 13:51:29 2004
+++ grep/doc/grep.texi	Wed Dec  8 14:18:29 2004
@@ -416,14 +416,13 @@
 @opindex --include
 @cindex include files
 @cindex searching directory trees
-When processing directories recursively, only files matching @var{file_pattern}
-will be search.
+Search only files matching @var{file_pattern}.
 
 @item --exclude=@var{file_pattern}
 @opindex --exclude
 @cindex exclude files
 @cindex searching directory trees
-When processing directories recursively, skip files matching @var{file_pattern}.
+Skip files @emph{and directories} matching @var{file_pattern}.
 
 @item -m @var{num}
 @itemx --max-count=@var{num}



From MAILER-DAEMON Wed Dec 08 09:29:06 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1Cc2oU-0001Br-3t
	for mharc-grep-commit@gnu.org; Wed, 08 Dec 2004 09:29:06 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1Cc2oR-0001Am-5R
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:29:03 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1Cc2oO-00019C-88
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:29:01 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1Cc2oN-000199-VF
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:29:00 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Cc2eQ-0001GB-GW
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:18:42 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Cc2b0-00047j-Py
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 09:15:10 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1Cc2eF-0001DU-8G
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 09:18:31 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Cc2eE-0001DA-Sh
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 09:18:31 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Cc2eE-0007z5-4U
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 09:18:30 -0500
To: grep-cvs-diffs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1Cc2eF-0001DU-8G@monty-python.gnu.org>
Date: Wed, 08 Dec 2004 09:18:31 -0500
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, 08 Dec 2004 14:29:03 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.207 grep/ChangeLog:1.208
--- grep/ChangeLog:1.207	Tue Nov 23 12:49:36 2004
+++ grep/ChangeLog	Wed Dec  8 14:18:29 2004
@@ -1,3 +1,17 @@
+2004-12-01  Stepan Kasal  <kasal@ucw.cz>
+
+	* src/grep.c (usage): Use ``FILE_PATTERN'' for --include and --exclude,
+	  change ``only print'' to ``print only''.
+	* doc/grep.1: Likewise; state that wildcard matching is used.
+	  Move some options so that they are sorted alphabetically.
+	* dfa.c, NEWS: Fix typos.
+
+2004-11-28  Benno Schulenberg  <benno@nietvergeten.nl>  (tiny change)
+
+	* src/grep.c (usage): Clean up several details in the usage string.
+	* doc/grep.1: Fix descriptions of --include and --exclude.
+	* doc/grep.texi: Likewise.
+
 2004-11-23  Stepan Kasal  <kasal@ucw.cz>
 
 	* src/Makefile.am: The egrep and fgrep script now use their own
@@ -12,7 +26,7 @@
 
 	* src/grep.c (usage): Make sure both copies of the ``usage''
 	  strings match.  Add ``(C)'' to the copyright notice.
-	* src/dfa.c: Changed "out of memory" to "memory exhausted" to
+	* src/dfa.c: Changed ``out of memory'' to ``memory exhausted'' to
 	  match messages elsewhere in the source.
 
 2004-11-22  Stepan Kasal  <kasal@ucw.cz>
@@ -66,7 +80,7 @@
 
 	* tests/spencer1.awk: Use only lines with 3 fields.
 	* tests/spencer1.tests: Disable #55 for now.
-	* tests/ere.tests, tests/bre.tests: Add "TO CORRECT" to disabled
+	* tests/ere.tests, tests/bre.tests: Add ``TO CORRECT'' to disabled
 	  tests which had empty $4.
 	* tests/backref.sh: Modify #2 so that current glibc regex can
 	  handle it in finite time.
@@ -100,7 +114,7 @@
 	* src/dfa.c: remove non-constant initializers from dfa.c
 
 2003-06-16  Stepan Kasal  <kasal@ucw.cz>
-	* doc/grep.1: two typos "--line-buffered [...] penalty"
+	* doc/grep.1: two typos ``--line-buffered [...] penalty''
 	* doc/grep.texi: a typo
 
 2003-06-12  Bernhard Rosenkraenzer <bero@arklinux.org>



From MAILER-DAEMON Wed Dec 08 09:29:06 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1Cc2oT-0001Bg-VP
	for mharc-grep-commit@gnu.org; Wed, 08 Dec 2004 09:29:06 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1Cc2oQ-0001Af-K2
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:29:02 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1Cc2oO-00019J-Cm
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:29:01 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1Cc2oO-000199-AL
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:29:00 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Cc2eM-0001FX-Fn
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:18:38 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Cc2aw-00047j-O3
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 09:15:06 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1Cc2eG-0001Dr-1j
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 09:18:32 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Cc2eF-0001DA-RF
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 09:18:31 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Cc2eF-0007zL-F5
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 09:18:31 -0500
To: grep-cvs-diffs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1Cc2eG-0001Dr-1j@monty-python.gnu.org>
Date: Wed, 08 Dec 2004 09:18:32 -0500
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: Wed, 08 Dec 2004 14:29:03 -0000

Index: grep/doc/grep.1
diff -u grep/doc/grep.1:1.25 grep/doc/grep.1:1.26
--- grep/doc/grep.1:1.25	Fri Nov 19 13:51:29 2004
+++ grep/doc/grep.1	Wed Dec  8 14:18:29 2004
@@ -12,7 +12,7 @@
 .de Id
 .ds Dt \\$4
 ..
-.Id $Id: grep.1,v 1.25 2004/11/19 13:51:29 kasal Exp $
+.Id $Id: grep.1,v 1.26 2004/12/08 14:18:29 kasal Exp $
 .TH GREP 1 \*(Dt "GNU Project"
 .SH NAME
 grep, egrep, fgrep \- print lines matching a pattern
@@ -186,15 +186,14 @@
 as the pattern; useful to protect patterns beginning with
 .BR \- .
 .TP
+.BI \-\^\-exclude= FILE_PATTERN
+.RI "Skip files " "and directories" " that match " FILE_PATTERN.
+.TP
 .BR \-F ", " \-\^\-fixed-strings
 Interpret
 .I PATTERN
 as a list of fixed strings, separated by newlines,
 any of which is to be matched.
-.BR \-P ", " \-\^\-perl-regexp
-Interpret
-.I PATTERN
-as a Perl regular expression.
 .TP
 .BI \-f " FILE" "\fR,\fP \-\^\-file=" FILE
 Obtain patterns from
@@ -228,6 +227,11 @@
 .I PATTERN
 and the input files.
 .TP
+.BI \-\^\-include= FILE_PATTERN
+Search only files that match
+.I FILE_PATTERN
+(using wildcard matching).
+.TP
 .BR \-L ", " \-\^\-files-without-match
 Suppress normal output; instead print the name
 of each input file from which no output would
@@ -240,6 +244,15 @@
 would normally have been printed.  The scanning will
 stop on the first match.
 .TP
+.BI \-\^\-label= LABEL
+Displays input actually coming from standard input as input coming from file
+.I LABEL.
+This is especially useful for tools like zgrep, e.g.
+.B "gzip -cd foo.gz |grep --label=foo something"
+.TP
+.BR \-\^\-line-buffered
+Use line buffering, it can be a performance penalty.
+.TP
 .BI \-m " NUM" "\fR,\fP \-\^\-max-count=" NUM
 Stop reading a file after
 .I NUM
@@ -294,16 +307,10 @@
 .TP
 .BR \-o ", " \-\^\-only-matching
 Show only the part of a matching line that matches
-.I PATTERN.
-.TP
-.BI \-\^\-label= LABEL
-Displays input actually coming from standard input as input coming from file
-.I LABEL.
-This is especially useful for tools like zgrep, e.g.
-.B "gzip -cd foo.gz |grep --label=foo something"
+.IR PATTERN .
 .TP
-.BR \-\^\-line-buffered
-Use line buffering, it can be a performance penalty.
+.BR \-P ", " \-\^\-perl-regexp
+.RI "Interpret " PATTERN " as a Perl regular expression."
 .TP
 .BR \-q ", " \-\^\-quiet ", " \-\^\-silent
 Quiet; do not write anything to standard output.
@@ -321,14 +328,6 @@
 .B "\-d recurse"
 option.
 .TP
-.BR "\fR \fP \-\^\-include=" PATTERN
-Recurse in directories only searching file matching
-.I PATTERN.
-.TP
-.BR "\fR \fP \-\^\-exclude=" PATTERN
-Recurse in directories skip file matching
-.I PATTERN.
-.TP
 .BR \-s ", " \-\^\-no-messages
 Suppress error messages about nonexistent or unreadable files.
 Portability note: unlike \s-1GNU\s0



From MAILER-DAEMON Wed Dec 08 09:29:09 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1Cc2oW-0001D9-Gm
	for mharc-grep-commit@gnu.org; Wed, 08 Dec 2004 09:29:08 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1Cc2oR-0001B2-Iv
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:29:03 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1Cc2oP-00019W-2Q
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:29:02 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1Cc2oO-000199-GS
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:29:00 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Cc2eL-0001FA-JP
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:18:37 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Cc2av-00047j-PT
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 09:15:05 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1Cc2eH-0001EV-AS
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 09:18:33 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Cc2eH-0001DA-1b
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 09:18:33 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Cc2eG-0007zY-Pb
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 09:18:33 -0500
To: grep-cvs-diffs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1Cc2eH-0001EV-AS@monty-python.gnu.org>
Date: Wed, 08 Dec 2004 09:18:33 -0500
Cc: 
Subject: Changes to grep/src/dfa.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, 08 Dec 2004 14:29:04 -0000

Index: grep/src/dfa.c
diff -u grep/src/dfa.c:1.28 grep/src/dfa.c:1.29
--- grep/src/dfa.c:1.28	Tue Nov 23 10:00:48 2004
+++ grep/src/dfa.c	Wed Dec  8 14:18:29 2004
@@ -2733,7 +2733,7 @@
 
   if (nelem == 0 || maxlen == 0)
     /* This state has no multibyte operator which can match.
-       We need to  check only one singlebyte character.  */
+       We need to check only one singlebyte character.  */
     {
       status_transit_state rs;
       rs = transit_state_singlebyte(d, s, *pp, &s1);



From MAILER-DAEMON Wed Dec 08 09:29:24 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1Cc2ol-0001En-Tq
	for mharc-grep-commit@gnu.org; Wed, 08 Dec 2004 09:29:24 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1Cc2ok-0001Ea-6j
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:29:22 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1Cc2oj-0001EB-Fm
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:29:21 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1Cc2oj-0001E8-Cr
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:29:21 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Cc2er-0001N2-G5
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:19:09 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Cc2bR-0004Av-Or
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 09:15:37 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1Cc2ep-0001Mg-EQ
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 09:19:07 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Cc2ep-0001MD-5o
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 09:19:07 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Cc2eH-0007zp-QR
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 09:18:34 -0500
To: grep-cvs-diffs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1Cc2ep-0001Mg-EQ@monty-python.gnu.org>
Date: Wed, 08 Dec 2004 09:19:07 -0500
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, 08 Dec 2004 14:29:22 -0000

Index: grep/src/grep.c
diff -u grep/src/grep.c:1.86 grep/src/grep.c:1.87
--- grep/src/grep.c:1.86	Tue Nov 23 10:00:48 2004
+++ grep/src/grep.c	Wed Dec  8 14:18:29 2004
@@ -677,7 +677,7 @@
 	    --p;
 	  while (p[-1] != eol);
 
-      /* We only print the "--" separator if our output is
+      /* We print the "--" separator only if our output is
 	 discontiguous from the last output in the file. */
       if ((out_before || out_after) && used && p != lastout)
 	puts ("--");
@@ -1123,21 +1123,21 @@
       --label=LABEL         print LABEL as filename for standard input\n\
   -o, --only-matching       show only the part of a line matching PATTERN\n\
   -q, --quiet, --silent     suppress all normal output\n\
-      --binary-files=TYPE   assume that binary files are TYPE\n\
-                            TYPE is 'binary', 'text', or 'without-match'\n\
+      --binary-files=TYPE   assume that binary files are TYPE;\n\
+                            TYPE is `binary', `text', or `without-match'\n\
   -a, --text                equivalent to --binary-files=text\n\
   -I                        equivalent to --binary-files=without-match\n\
-  -d, --directories=ACTION  how to handle directories\n\
-                            ACTION is 'read', 'recurse', or 'skip'\n\
-  -D, --devices=ACTION      how to handle devices, FIFOs and sockets\n\
-                            ACTION is 'read' or 'skip'\n\
+  -d, --directories=ACTION  how to handle directories;\n\
+                            ACTION is `read', `recurse', or `skip'\n\
+  -D, --devices=ACTION      how to handle devices, FIFOs and sockets;\n\
+                            ACTION is `read' or `skip'\n\
   -R, -r, --recursive       equivalent to --directories=recurse\n\
-      --include=PATTERN     files that match PATTERN will be examined\n\
-      --exclude=PATTERN     files that match PATTERN will be skipped.\n\
-      --exclude-from=FILE   files that match PATTERN in FILE will be skipped.\n\
-  -L, --files-without-match only print FILE names containing no match\n\
-  -l, --files-with-matches  only print FILE names containing matches\n\
-  -c, --count               only print a count of matching lines per FILE\n\
+      --include=FILE_PATTERN  search only files that match FILE_PATTERN\n\
+      --exclude=FILE_PATTERN  skip files and directories matching FILE_PATTERN\n\
+      --exclude-from=FILE   skip files matching any file pattern from FILE\n\
+  -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\
   -Z, --null                print 0 byte after FILE name\n"));
       printf (_("\
 \n\
@@ -1147,15 +1147,15 @@
   -C, --context=NUM         print NUM lines of output context\n\
   -NUM                      same as --context=NUM\n\
       --color[=WHEN],\n\
-      --colour[=WHEN]       use markers to distinguish the matching string\n\
-                            WHEN may be `always', `never' or `auto'.\n\
+      --colour[=WHEN]       use markers to distinguish the matching string;\n\
+                            WHEN may be `always', `never', or `auto'\n\
   -U, --binary              do not strip CR characters at EOL (MSDOS)\n\
   -u, --unix-byte-offsets   report offsets as if CRs were not there (MSDOS)\n\
 \n\
 `egrep' means `grep -E'.  `fgrep' means `grep -F'.\n\
-With no FILE, or when FILE is -, read standard input.  If less than\n\
-two FILEs given, assume -h.  Exit status is 0 if match, 1 if no match,\n\
-and 2 if trouble.\n"));
+With no FILE, or when FILE is -, read standard input.  If less than two FILEs\n\
+are given, assume -h.  Exit status is 0 if any line was selected, 1 otherwise;\n\
+if any error occurs and -q was not given, the exit status is 2.\n"));
       printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
     }
   exit (status);



From MAILER-DAEMON Wed Dec 08 09:31:26 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1Cc2qk-0001T0-89
	for mharc-grep-commit@gnu.org; Wed, 08 Dec 2004 09:31:26 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1Cc2qg-0001RK-Gp
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:31:22 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1Cc2qf-0001Qn-Ii
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:31:21 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1Cc2qf-0001QZ-ER
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:31:21 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Cc2gm-0001mX-QV
	for grep-commit@gnu.org; Wed, 08 Dec 2004 09:21:08 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Cc2dN-0004PC-2v
	for grep-cvs-logs@gnu.org; Wed, 08 Dec 2004 09:17:37 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1Cc2gc-0001jx-NI
	for grep-cvs-logs@gnu.org; Wed, 08 Dec 2004 09:20:59 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Cc2gc-0001jq-IG
	for grep-cvs-logs@gnu.org; Wed, 08 Dec 2004 09:20:58 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Cc2eI-000800-FK
	for grep-cvs-logs@gnu.org; Wed, 08 Dec 2004 09:18:34 -0500
To: grep-cvs-logs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1Cc2gc-0001jx-NI@monty-python.gnu.org>
Date: Wed, 08 Dec 2004 09:20:58 -0500
Cc: 
Subject: grep ./ChangeLog ./NEWS doc/grep.1 doc/grep.tex...
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, 08 Dec 2004 14:31:24 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Stepan Kasal <kasal@ucw.cz>	04/12/08 14:18:30

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

Log message:
	fix docs, mainly about --include and --exclude

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.207&tr2=1.208&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/NEWS.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/doc/grep.1.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/doc/grep.texi.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/dfa.c.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/grep.c.diff?tr1=1.86&tr2=1.87&r1=text&r2=text




From MAILER-DAEMON Wed Dec 08 17:26:26 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CcAGQ-0004Jh-3E
	for mharc-grep-commit@gnu.org; Wed, 08 Dec 2004 17:26:26 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CcAGL-0004Fv-5a
	for grep-commit@gnu.org; Wed, 08 Dec 2004 17:26:22 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CcAGH-0004DZ-Vm
	for grep-commit@gnu.org; Wed, 08 Dec 2004 17:26:18 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CcAGH-0004Cn-R6
	for grep-commit@gnu.org; Wed, 08 Dec 2004 17:26:17 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1CcA6F-0007a5-HY
	for grep-commit@gnu.org; Wed, 08 Dec 2004 17:15:55 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1CcA2n-0005qP-KZ
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 17:12:21 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1CcA6D-0007ZJ-Od
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 17:15:55 -0500
Received: from [199.232.41.5] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CcA6D-0007XR-Jj
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 17:15:53 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.34) id 1Cc2eE-0001L3-TW
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 09:18:31 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Cc2eE-0007zB-Q5
	for grep-cvs-diffs@gnu.org; Wed, 08 Dec 2004 09:18:31 -0500
To: grep-cvs-diffs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1CcA6D-0007ZJ-Od@monty-python.gnu.org>
Date: Wed, 08 Dec 2004 17:15:54 -0500
Cc: 
Subject: Changes to grep/NEWS
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, 08 Dec 2004 22:26:24 -0000

Index: grep/NEWS
diff -u grep/NEWS:1.38 grep/NEWS:1.39
--- grep/NEWS:1.38	Tue Mar 26 15:37:07 2002
+++ grep/NEWS	Wed Dec  8 14:18:29 2004
@@ -28,7 +28,7 @@
     grep -e '\(a\)\1' -e '\(b\)\1'
     The last backref \1 in the second expression refer to \(b\)
 
-  - The new option --include=PATTERN will only search matching files
+  - The new option --include=PATTERN will search only matching files
     when recursing in directories
 
   - The new option --exclude=PATTERN will skip matching files when



From MAILER-DAEMON Wed Dec 15 08:46:52 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CeZUS-0004qH-E3
	for mharc-grep-commit@gnu.org; Wed, 15 Dec 2004 08:46:52 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CeZUQ-0004pN-MF
	for grep-commit@gnu.org; Wed, 15 Dec 2004 08:46:50 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CeZUO-0004oJ-Ft
	for grep-commit@gnu.org; Wed, 15 Dec 2004 08:46:48 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CeZUO-0004o9-AM
	for grep-commit@gnu.org; Wed, 15 Dec 2004 08:46:48 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1CeZKA-0007bE-BY
	for grep-commit@gnu.org; Wed, 15 Dec 2004 08:36:14 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1CeZG0-0008Gh-9O
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 08:31:56 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1CeZJo-0007RV-0a
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 08:35:52 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CeZJn-0007Hd-P6
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 08:35:51 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CeZEl-0002Eq-Ai
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 08:30:39 -0500
To: grep-cvs-diffs@gnu.org
From: Julian Foad <julianfoad@btopenworld.com>
Message-Id: <E1CeZJo-0007RV-0a@monty-python.gnu.org>
Date: Wed, 15 Dec 2004 08:35:52 -0500
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: Wed, 15 Dec 2004 13:46:51 -0000

Index: grep/doc/grep.1
diff -u grep/doc/grep.1:1.26 grep/doc/grep.1:1.27
--- grep/doc/grep.1:1.26	Wed Dec  8 14:18:29 2004
+++ grep/doc/grep.1	Wed Dec 15 13:30:38 2004
@@ -12,7 +12,7 @@
 .de Id
 .ds Dt \\$4
 ..
-.Id $Id: grep.1,v 1.26 2004/12/08 14:18:29 kasal Exp $
+.Id $Id: grep.1,v 1.27 2004/12/15 13:30:38 julianfoad Exp $
 .TH GREP 1 \*(Dt "GNU Project"
 .SH NAME
 grep, egrep, fgrep \- print lines matching a pattern
@@ -127,9 +127,12 @@
 terminal driver interprets some of it as commands.
 .TP
 .BI \-\^\-colour[=\fIWHEN\fR] ", " \-\^\-color[=\fIWHEN\fR]
-Surround the matching string with the marker find in
+Surround the matching string with escape sequences to display them in color
+on the terminal.  The color is defined by the environment variable
 .B GREP_COLOR
-environment variable. WHEN may be `never', `always', or `auto'
+and defaults to `01;31' which means the text is red.
+.I WHEN
+is `never', `always', or `auto'.
 .TP
 .BR \-c ", " \-\^\-count
 Suppress normal output; instead print a count of
@@ -245,7 +248,7 @@
 stop on the first match.
 .TP
 .BI \-\^\-label= LABEL
-Displays input actually coming from standard input as input coming from file
+Display input actually coming from standard input as input coming from file
 .I LABEL.
 This is especially useful for tools like zgrep, e.g.
 .B "gzip -cd foo.gz |grep --label=foo something"



From MAILER-DAEMON Wed Dec 15 08:46:52 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CeZUS-0004qX-PF
	for mharc-grep-commit@gnu.org; Wed, 15 Dec 2004 08:46:52 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CeZUQ-0004pY-R7
	for grep-commit@gnu.org; Wed, 15 Dec 2004 08:46:50 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CeZUO-0004oc-Sz
	for grep-commit@gnu.org; Wed, 15 Dec 2004 08:46:49 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CeZUO-0004o9-NV
	for grep-commit@gnu.org; Wed, 15 Dec 2004 08:46:48 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1CeZJo-0007QC-8I
	for grep-commit@gnu.org; Wed, 15 Dec 2004 08:35:52 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1CeZFb-00089g-OF
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 08:31:31 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1CeZJf-0007NQ-Vh
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 08:35:44 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CeZJf-0007Hd-Ms
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 08:35:43 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CeZEm-0002FH-Q1
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 08:30:41 -0500
To: grep-cvs-diffs@gnu.org
From: Julian Foad <julianfoad@btopenworld.com>
Message-Id: <E1CeZJf-0007NQ-Vh@monty-python.gnu.org>
Date: Wed, 15 Dec 2004 08:35:44 -0500
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, 15 Dec 2004 13:46:51 -0000

Index: grep/src/grep.c
diff -u grep/src/grep.c:1.87 grep/src/grep.c:1.88
--- grep/src/grep.c:1.87	Wed Dec  8 14:18:29 2004
+++ grep/src/grep.c	Wed Dec 15 13:30:37 2004
@@ -1148,7 +1148,7 @@
   -NUM                      same as --context=NUM\n\
       --color[=WHEN],\n\
       --colour[=WHEN]       use markers to distinguish the matching string;\n\
-                            WHEN may be `always', `never', or `auto'\n\
+                            WHEN is `always', `never', or `auto'\n\
   -U, --binary              do not strip CR characters at EOL (MSDOS)\n\
   -u, --unix-byte-offsets   report offsets as if CRs were not there (MSDOS)\n\
 \n\



From MAILER-DAEMON Wed Dec 15 08:46:53 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CeZUS-0004qd-Tf
	for mharc-grep-commit@gnu.org; Wed, 15 Dec 2004 08:46:53 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CeZUQ-0004pc-V0
	for grep-commit@gnu.org; Wed, 15 Dec 2004 08:46:51 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CeZUP-0004ol-Hd
	for grep-commit@gnu.org; Wed, 15 Dec 2004 08:46:49 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CeZUO-0004o9-Rf
	for grep-commit@gnu.org; Wed, 15 Dec 2004 08:46:48 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1CeZJo-0007QQ-85
	for grep-commit@gnu.org; Wed, 15 Dec 2004 08:35:52 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1CeZFb-00089g-Ux
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 08:31:32 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1CeZJk-0007Pc-9L
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 08:35:48 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CeZJj-0007Hd-Sb
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 08:35:48 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CeZEl-0002F2-Sw
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 08:30:40 -0500
To: grep-cvs-diffs@gnu.org
From: Julian Foad <julianfoad@btopenworld.com>
Message-Id: <E1CeZJk-0007Pc-9L@monty-python.gnu.org>
Date: Wed, 15 Dec 2004 08:35:48 -0500
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: Wed, 15 Dec 2004 13:46:51 -0000

Index: grep/doc/grep.texi
diff -u grep/doc/grep.texi:1.48 grep/doc/grep.texi:1.49
--- grep/doc/grep.texi:1.48	Wed Dec  8 14:18:29 2004
+++ grep/doc/grep.texi	Wed Dec 15 13:30:38 2004
@@ -265,8 +265,10 @@
 @itemx --color[=@var{WHEN}]
 @opindex --colour
 @cindex highlight, color, colour
-The matching string is surrounded by the marker specify in @var{GREP_COLOR}.
-@var{WHEN} may be `never', `always', or `auto'.
+Surround the matching string 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.
+@var{WHEN} is `never', `always', or `auto'.
 
 @item -@var{num}
 @opindex -NUM
@@ -362,7 +364,7 @@
 @item --label=@var{LABEL}
 @opindex --label
 @cindex changing name of standard input
-Displays input actually coming from standard input as input coming from file
+Display input actually coming from standard input as input coming from file
 @var{LABEL}. This is especially useful for tools like zgrep, e.g.
 @command{gzip -cd foo.gz |grep --label=foo something}
 
@@ -574,8 +576,8 @@
 @item GREP_COLOR
 @vindex GREP_COLOR
 @cindex highlight markers
-This variable specifies the surrounding markers use to highlight the matching
-text.  The default is control ascii red.
+This variable specifies the color used to highlight the matching text.
+The default is `01;31' which means red text on the default background.
 
 @item LC_ALL
 @itemx LC_COLLATE



From MAILER-DAEMON Wed Dec 15 08:46:53 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CeZUT-0004qx-56
	for mharc-grep-commit@gnu.org; Wed, 15 Dec 2004 08:46:53 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CeZUQ-0004pb-Tx
	for grep-commit@gnu.org; Wed, 15 Dec 2004 08:46:51 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CeZUP-0004ox-78
	for grep-commit@gnu.org; Wed, 15 Dec 2004 08:46:49 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CeZUP-0004o9-0i
	for grep-commit@gnu.org; Wed, 15 Dec 2004 08:46:49 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1CeZJo-0007RC-89
	for grep-commit@gnu.org; Wed, 15 Dec 2004 08:35:52 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1CeZFd-00089g-Bo
	for grep-cvs-logs@gnu.org; Wed, 15 Dec 2004 08:31:33 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1CeZJe-0007Mi-HS
	for grep-cvs-logs@gnu.org; Wed, 15 Dec 2004 08:35:43 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CeZJe-0007Hd-03
	for grep-cvs-logs@gnu.org; Wed, 15 Dec 2004 08:35:42 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CeZEn-0002FQ-MH
	for grep-cvs-logs@gnu.org; Wed, 15 Dec 2004 08:30:42 -0500
To: grep-cvs-logs@gnu.org
From: Julian Foad <julianfoad@btopenworld.com>
Message-Id: <E1CeZJe-0007Mi-HS@monty-python.gnu.org>
Date: Wed, 15 Dec 2004 08:35:43 -0500
Cc: 
Subject: grep src/grep.c doc/grep.texi doc/grep.1 ./Chan...
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 Dec 2004 13:46:51 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Julian Foad <julianfoad@btopenworld.com>	04/12/15 13:30:38

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

Log message:
	Minor fixes of phrasing.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/grep.c.diff?tr1=1.87&tr2=1.88&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/doc/grep.texi.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/doc/grep.1.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.208&tr2=1.209&r1=text&r2=text




From MAILER-DAEMON Wed Dec 15 08:46:53 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CeZUT-0004r3-AW
	for mharc-grep-commit@gnu.org; Wed, 15 Dec 2004 08:46:53 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CeZUQ-0004pP-MT
	for grep-commit@gnu.org; Wed, 15 Dec 2004 08:46:50 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CeZUO-0004oC-7Y
	for grep-commit@gnu.org; Wed, 15 Dec 2004 08:46:48 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CeZUO-0004o9-45
	for grep-commit@gnu.org; Wed, 15 Dec 2004 08:46:48 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1CeZK9-0007au-Oh
	for grep-commit@gnu.org; Wed, 15 Dec 2004 08:36:13 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1CeZFz-0008Gh-Nc
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 08:31:55 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1CeZJw-0007Vh-JI
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 08:36:00 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CeZJw-0007Hd-8s
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 08:36:00 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CeZEk-0002Ej-N1
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 08:30:39 -0500
To: grep-cvs-diffs@gnu.org
From: Julian Foad <julianfoad@btopenworld.com>
Message-Id: <E1CeZJw-0007Vh-JI@monty-python.gnu.org>
Date: Wed, 15 Dec 2004 08:36:00 -0500
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 Dec 2004 13:46:51 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.208 grep/ChangeLog:1.209
--- grep/ChangeLog:1.208	Wed Dec  8 14:18:29 2004
+++ grep/ChangeLog	Wed Dec 15 13:30:38 2004
@@ -1,3 +1,9 @@
+2004-12-15  Julian Foad  <julianfoad@btopenworld.com>
+
+	* doc/grep.texi: Minor fixes of phrasing.
+	* doc/grep.1: Likewise.
+	* src/grep.c: Likewise.
+
 2004-12-01  Stepan Kasal  <kasal@ucw.cz>
 
 	* src/grep.c (usage): Use ``FILE_PATTERN'' for --include and --exclude,



From MAILER-DAEMON Wed Dec 15 09:40:42 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CeaKX-0003dG-L2
	for mharc-grep-commit@gnu.org; Wed, 15 Dec 2004 09:40:41 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CeaKT-0003aQ-RO
	for grep-commit@gnu.org; Wed, 15 Dec 2004 09:40:39 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CeaKS-0003ZM-J2
	for grep-commit@gnu.org; Wed, 15 Dec 2004 09:40:36 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CeaKS-0003Yj-4J
	for grep-commit@gnu.org; Wed, 15 Dec 2004 09:40:36 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1CeaA9-0008BV-1Y
	for grep-commit@gnu.org; Wed, 15 Dec 2004 09:29:57 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Cea5x-0001ns-R3
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 09:25:37 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1Cea9K-0007lP-A7
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 09:29:07 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Cea9K-0007kC-2Q
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 09:29:06 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CeaDi-0000Dq-Vg
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 09:33:39 -0500
To: grep-cvs-diffs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1Cea9K-0007lP-A7@monty-python.gnu.org>
Date: Wed, 15 Dec 2004 09:29:07 -0500
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: Wed, 15 Dec 2004 14:40:40 -0000

Index: grep/doc/grep.1
diff -u grep/doc/grep.1:1.27 grep/doc/grep.1:1.28
--- grep/doc/grep.1:1.27	Wed Dec 15 13:30:38 2004
+++ grep/doc/grep.1	Wed Dec 15 14:33:38 2004
@@ -12,7 +12,7 @@
 .de Id
 .ds Dt \\$4
 ..
-.Id $Id: grep.1,v 1.27 2004/12/15 13:30:38 julianfoad Exp $
+.Id $Id: grep.1,v 1.28 2004/12/15 14:33:38 kasal Exp $
 .TH GREP 1 \*(Dt "GNU Project"
 .SH NAME
 grep, egrep, fgrep \- print lines matching a pattern
@@ -127,7 +127,7 @@
 terminal driver interprets some of it as commands.
 .TP
 .BI \-\^\-colour[=\fIWHEN\fR] ", " \-\^\-color[=\fIWHEN\fR]
-Surround the matching string with escape sequences to display them in color
+Surround the matching strings with escape sequences to display them in color
 on the terminal.  The color is defined by the environment variable
 .B GREP_COLOR
 and defaults to `01;31' which means the text is red.



From MAILER-DAEMON Wed Dec 15 11:03:58 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1Cebd8-0002a7-IQ
	for mharc-grep-commit@gnu.org; Wed, 15 Dec 2004 11:03:58 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1Cebcx-0002Xw-Au
	for grep-commit@gnu.org; Wed, 15 Dec 2004 11:03:47 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1Cebcw-0002XW-Ig
	for grep-commit@gnu.org; Wed, 15 Dec 2004 11:03:46 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1Cebcw-0002XT-EV
	for grep-commit@gnu.org; Wed, 15 Dec 2004 11:03:46 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1CebSg-0004U7-VB
	for grep-commit@gnu.org; Wed, 15 Dec 2004 10:53:10 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1CebOW-0004ME-AU
	for grep-cvs-logs@gnu.org; Wed, 15 Dec 2004 10:48:52 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1CebSY-0004Qb-6R
	for grep-cvs-logs@gnu.org; Wed, 15 Dec 2004 10:53:03 -0500
Received: from [199.232.41.5] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CebSY-0004QU-0C
	for grep-cvs-logs@gnu.org; Wed, 15 Dec 2004 10:53:02 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.34) id 1Cea9P-0007Cy-Mj
	for grep-cvs-logs@gnu.org; Wed, 15 Dec 2004 09:29:11 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CeaDm-0000EU-1m
	for grep-cvs-logs@gnu.org; Wed, 15 Dec 2004 09:33:42 -0500
To: grep-cvs-logs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1CebSY-0004Qb-6R@monty-python.gnu.org>
Date: Wed, 15 Dec 2004 10:53:03 -0500
Cc: 
Subject: grep doc/grep.1 doc/grep.texi 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, 15 Dec 2004 16:03:47 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Stepan Kasal <kasal@ucw.cz>	04/12/15 14:33:38

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

Log message:
	more phrasing fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/doc/grep.1.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/doc/grep.texi.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/grep.c.diff?tr1=1.88&tr2=1.89&r1=text&r2=text




From MAILER-DAEMON Wed Dec 15 11:50:19 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CecLy-00012a-3r
	for mharc-grep-commit@gnu.org; Wed, 15 Dec 2004 11:50:19 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CecLu-00011v-LP
	for grep-commit@gnu.org; Wed, 15 Dec 2004 11:50:14 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CecLt-00011P-KW
	for grep-commit@gnu.org; Wed, 15 Dec 2004 11:50:13 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CecLt-000119-FY
	for grep-commit@gnu.org; Wed, 15 Dec 2004 11:50:13 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1CecBL-0000Ht-Iz
	for grep-commit@gnu.org; Wed, 15 Dec 2004 11:39:19 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Cec7A-0005VB-MX
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 11:35:00 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1CecA4-0008Dx-O5
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 11:38:02 -0500
Received: from [199.232.41.5] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CecA4-0004jG-Fa
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 11:38:00 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.34) id 1Cea9R-0007Cy-0f
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 09:29:13 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CeaDk-0000EF-Ou
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 09:33:41 -0500
To: grep-cvs-diffs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1CecA4-0008Dx-O5@monty-python.gnu.org>
Date: Wed, 15 Dec 2004 11:38:01 -0500
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, 15 Dec 2004 16:50:15 -0000

Index: grep/src/grep.c
diff -u grep/src/grep.c:1.88 grep/src/grep.c:1.89
--- grep/src/grep.c:1.88	Wed Dec 15 13:30:37 2004
+++ grep/src/grep.c	Wed Dec 15 14:33:38 2004
@@ -1147,7 +1147,7 @@
   -C, --context=NUM         print NUM lines of output context\n\
   -NUM                      same as --context=NUM\n\
       --color[=WHEN],\n\
-      --colour[=WHEN]       use markers to distinguish the matching string;\n\
+      --colour[=WHEN]       use markers to highlight the matching strings;\n\
                             WHEN is `always', `never', or `auto'\n\
   -U, --binary              do not strip CR characters at EOL (MSDOS)\n\
   -u, --unix-byte-offsets   report offsets as if CRs were not there (MSDOS)\n\



From MAILER-DAEMON Wed Dec 15 11:51:26 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CecN3-0001Wp-PN
	for mharc-grep-commit@gnu.org; Wed, 15 Dec 2004 11:51:25 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CecN1-0001Ud-8d
	for grep-commit@gnu.org; Wed, 15 Dec 2004 11:51:23 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CecMz-0001TT-LA
	for grep-commit@gnu.org; Wed, 15 Dec 2004 11:51:22 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CecMz-0001SJ-Dl
	for grep-commit@gnu.org; Wed, 15 Dec 2004 11:51:21 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1CecCa-0000rj-3U
	for grep-commit@gnu.org; Wed, 15 Dec 2004 11:40:36 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Cec81-0005xk-4T
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 11:35:54 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1CecA8-0008F6-ET
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 11:38:04 -0500
Received: from [199.232.41.5] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CecA7-0004jG-Vg
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 11:38:04 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.34) id 1Cea9O-0007Cy-Jd
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 09:29:10 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CeaDj-0000E3-Vp
	for grep-cvs-diffs@gnu.org; Wed, 15 Dec 2004 09:33:40 -0500
To: grep-cvs-diffs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1CecA8-0008F6-ET@monty-python.gnu.org>
Date: Wed, 15 Dec 2004 11:38:04 -0500
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: Wed, 15 Dec 2004 16:51:24 -0000

Index: grep/doc/grep.texi
diff -u grep/doc/grep.texi:1.49 grep/doc/grep.texi:1.50
--- grep/doc/grep.texi:1.49	Wed Dec 15 13:30:38 2004
+++ grep/doc/grep.texi	Wed Dec 15 14:33:38 2004
@@ -265,7 +265,7 @@
 @itemx --color[=@var{WHEN}]
 @opindex --colour
 @cindex highlight, color, colour
-Surround the matching string with escape sequences to display them in color
+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.
 @var{WHEN} is `never', `always', or `auto'.
@@ -275,7 +275,6 @@
 Same as @samp{--context=@var{num}} lines of leading and trailing
 context.  However, grep will never print any given line more than once.
 
-
 @item -V
 @itemx --version
 @opindex -V



From MAILER-DAEMON Thu Dec 16 02:43:57 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CeqIm-00081D-US
	for mharc-grep-commit@gnu.org; Thu, 16 Dec 2004 02:43:57 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CeqIh-0007y5-OZ
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:43:51 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CeqId-0007vO-3J
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:43:47 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CeqIc-0007vL-8t
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:43:47 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Ceq7v-0003Xw-4d
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:32:43 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Ceq3g-00086F-4n
	for grep-cvs-logs@gnu.org; Thu, 16 Dec 2004 02:28:20 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1Ceq7m-0003Tf-0O
	for grep-cvs-logs@gnu.org; Thu, 16 Dec 2004 02:32:34 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Ceq7l-0003T4-Q6
	for grep-cvs-logs@gnu.org; Thu, 16 Dec 2004 02:32:33 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Ceptw-0003oi-Si
	for grep-cvs-logs@gnu.org; Thu, 16 Dec 2004 02:18:16 -0500
To: grep-cvs-logs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1Ceq7m-0003Tf-0O@monty-python.gnu.org>
Date: Thu, 16 Dec 2004 02:32:34 -0500
Cc: 
Subject: grep ./ChangeLog lib/regex.c src/dfa.c src/grep...
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, 16 Dec 2004 07:43:53 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Stepan Kasal <kasal@ucw.cz>	04/12/16 07:18:15

Modified files:
	.              : ChangeLog 
	lib            : regex.c 
	src            : dfa.c grep.c search.c 

Log message:
	i18n patch by Isamu Hasegawa from IBM Japan

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.209&tr2=1.210&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/lib/regex.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/dfa.c.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/grep.c.diff?tr1=1.89&tr2=1.90&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/search.c.diff?tr1=1.29&tr2=1.30&r1=text&r2=text




From MAILER-DAEMON Thu Dec 16 02:43:57 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CeqIn-00081R-83
	for mharc-grep-commit@gnu.org; Thu, 16 Dec 2004 02:43:57 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CeqIh-0007xs-7O
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:43:51 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CeqId-0007w4-S5
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:43:48 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CeqId-0007vL-Nl
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:43:47 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Ceq7u-0003XM-As
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:32:42 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Ceq3f-00086F-BY
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 02:28:19 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1Ceq7n-0003UK-Ax
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 02:32:35 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Ceq7n-0003T4-3W
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 02:32:35 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Ceptw-0003oV-An
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 02:18:16 -0500
To: grep-cvs-diffs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1Ceq7n-0003UK-Ax@monty-python.gnu.org>
Date: Thu, 16 Dec 2004 02:32:35 -0500
Cc: 
Subject: Changes to grep/src/dfa.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: Thu, 16 Dec 2004 07:43:53 -0000

Index: grep/src/dfa.c
diff -u grep/src/dfa.c:1.29 grep/src/dfa.c:1.30
--- grep/src/dfa.c:1.29	Wed Dec  8 14:18:29 2004
+++ grep/src/dfa.c	Thu Dec 16 07:18:15 2004
@@ -460,7 +460,7 @@
 
 /* This function fetch a wide character, and update cur_mb_len,
    used only if the current locale is a multibyte environment.  */
-static wchar_t
+static wint_t
 fetch_wc (char const *eoferr)
 {
   wchar_t wc;
@@ -469,7 +469,7 @@
       if (eoferr != 0)
 	dfaerror (eoferr);
       else
-	return -1;
+	return WEOF;
     }
 
   cur_mb_len = mbrtowc(&wc, lexptr, lexleft, &mbs);
@@ -505,7 +505,7 @@
 static void
 parse_bracket_exp_mb ()
 {
-  wchar_t wc, wc1, wc2;
+  wint_t wc, wc1, wc2;
 
   /* Work area to build a mb_char_classes.  */
   struct mb_char_classes *work_mbc;
@@ -542,7 +542,7 @@
     work_mbc->invert = 0;
   do
     {
-      wc1 = -1; /* mark wc1 is not initialized".  */
+      wc1 = WEOF; /* mark wc1 is not initialized".  */
 
       /* Note that if we're looking at some other [:...:] construct,
 	 we just treat it as a bunch of ordinary characters.  We can do
@@ -597,7 +597,7 @@
 		  wt = wctype (str);
 
 		  if (ch_classes_al == 0)
-		    MALLOC(work_mbc->ch_classes, wchar_t, ++ch_classes_al);
+		    MALLOC(work_mbc->ch_classes, wctype_t, ++ch_classes_al);
 		  REALLOC_IF_NECESSARY(work_mbc->ch_classes, wctype_t,
 				       ch_classes_al,
 				       work_mbc->nch_classes + 1);
@@ -632,7 +632,7 @@
 		      work_mbc->coll_elems[work_mbc->ncoll_elems++] = elem;
 		    }
  		}
-	      wc = -1;
+	      wc = WEOF;
 	    }
 	  else
 	    /* We treat '[' as a normal character here.  */
@@ -646,7 +646,7 @@
 	    wc = fetch_wc(("Unbalanced ["));
 	}
 
-      if (wc1 == -1)
+      if (wc1 == WEOF)
 	wc1 = fetch_wc(_("Unbalanced ["));
 
       if (wc1 == L'-')
@@ -676,17 +676,17 @@
 	    }
 	  REALLOC_IF_NECESSARY(work_mbc->range_sts, wchar_t,
 			       range_sts_al, work_mbc->nranges + 1);
-	  work_mbc->range_sts[work_mbc->nranges] = wc;
+	  work_mbc->range_sts[work_mbc->nranges] = (wchar_t)wc;
 	  REALLOC_IF_NECESSARY(work_mbc->range_ends, wchar_t,
 			       range_ends_al, work_mbc->nranges + 1);
-	  work_mbc->range_ends[work_mbc->nranges++] = wc2;
+	  work_mbc->range_ends[work_mbc->nranges++] = (wchar_t)wc2;
 	}
-      else if (wc != -1)
+      else if (wc != WEOF)
 	/* build normal characters.  */
 	{
 	  REALLOC_IF_NECESSARY(work_mbc->chars, wchar_t, chars_al,
 			       work_mbc->nchars + 1);
-	  work_mbc->chars[work_mbc->nchars++] = wc;
+	  work_mbc->chars[work_mbc->nchars++] = (wchar_t)wc;
 	}
     }
   while ((wc = wc1) != L']');



From MAILER-DAEMON Thu Dec 16 02:43:57 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CeqIn-00081H-2Y
	for mharc-grep-commit@gnu.org; Thu, 16 Dec 2004 02:43:57 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CeqIh-0007y0-3W
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:43:51 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CeqId-0007vx-MV
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:43:47 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CeqId-0007vL-Kj
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:43:47 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Ceq7u-0003XU-Ib
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:32:42 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Ceq3f-00086F-IZ
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 02:28:19 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1Ceq7m-0003U3-SP
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 02:32:35 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Ceq7m-0003T4-K7
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 02:32:34 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Ceptw-0003oa-Hq
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 02:18:16 -0500
To: grep-cvs-diffs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1Ceq7m-0003U3-SP@monty-python.gnu.org>
Date: Thu, 16 Dec 2004 02:32:35 -0500
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: Thu, 16 Dec 2004 07:43:53 -0000

Index: grep/src/grep.c
diff -u grep/src/grep.c:1.89 grep/src/grep.c:1.90
--- grep/src/grep.c:1.89	Wed Dec 15 14:33:38 2004
+++ grep/src/grep.c	Thu Dec 16 07:18:15 2004
@@ -30,6 +30,12 @@
 # include <sys/time.h>
 # include <sys/resource.h>
 #endif
+#if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H && defined HAVE_MBRTOWC
+/* We can handle multibyte string.  */
+# define MBS_SUPPORT
+# include <wchar.h>
+# include <wctype.h>
+#endif
 #include <stdio.h>
 #include "system.h"
 #include "getopt.h"
@@ -1729,6 +1735,37 @@
   if (!install_matcher (matcher) && !install_matcher ("default"))
     abort ();
 
+#ifdef MBS_SUPPORT
+  if (MB_CUR_MAX != 1 && match_icase)
+    {
+      wchar_t wc;
+      mbstate_t cur_state, prev_state;
+      int i, len = strlen(keys);
+
+      memset(&cur_state, 0, sizeof(mbstate_t));
+      for (i = 0; i <= len ;)
+	{
+	  size_t mbclen;
+	  mbclen = mbrtowc(&wc, keys + i, len - i, &cur_state);
+	  if (mbclen == (size_t) -1 || mbclen == (size_t) -2 || mbclen == 0)
+	    {
+	      /* An invalid sequence, or a truncated multibyte character.
+		 We treat it as a singlebyte character.  */
+	      mbclen = 1;
+	    }
+	  else
+	    {
+	      if (iswupper((wint_t)wc))
+		{
+		  wc = towlower((wint_t)wc);
+		  wcrtomb(keys + i, wc, &cur_state);
+		}
+	    }
+	  i += mbclen;
+	}
+    }
+#endif /* MBS_SUPPORT */
+
   (*compile)(keys, keycc);
 
   if ((argc - optind > 1 && !no_filenames) || with_filenames)



From MAILER-DAEMON Thu Dec 16 02:43:58 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CeqIo-000829-1L
	for mharc-grep-commit@gnu.org; Thu, 16 Dec 2004 02:43:58 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CeqIj-0007zJ-Dg
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:43:53 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CeqIe-0007wL-Of
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:43:49 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CeqId-0007vL-Vg
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:43:48 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Ceq7t-0003Wz-P4
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:32:41 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Ceq3e-00086F-Mc
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 02:28:18 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1Ceq7o-0003Ur-BY
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 02:32:36 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Ceq7o-0003T4-2x
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 02:32:36 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Ceptv-0003oL-Lx
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 02:18:15 -0500
To: grep-cvs-diffs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1Ceq7o-0003Ur-BY@monty-python.gnu.org>
Date: Thu, 16 Dec 2004 02:32:36 -0500
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, 16 Dec 2004 07:43:55 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.209 grep/ChangeLog:1.210
--- grep/ChangeLog:1.209	Wed Dec 15 13:30:38 2004
+++ grep/ChangeLog	Thu Dec 16 07:18:15 2004
@@ -1,3 +1,12 @@
+2004-12-16  Isamu Hasegawa  <isamuh@jp.ibm.com>
+
+	From http://oss.software.ibm.com/linux/patches/?patch_id=25
+
+	* src/search.c: Patch for i18n correctness.
+	* src/grep.c: Likewise.
+	* src/dfa.c: Likewise.
+	* lib/regex.c: Likewise.
+
 2004-12-15  Julian Foad  <julianfoad@btopenworld.com>
 
 	* doc/grep.texi: Minor fixes of phrasing.



From MAILER-DAEMON Thu Dec 16 02:44:00 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CeqIq-00083C-5U
	for mharc-grep-commit@gnu.org; Thu, 16 Dec 2004 02:44:00 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CeqIk-0007zK-16
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:43:54 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CeqIe-0007wB-R5
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:43:49 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CeqId-0007vL-Rv
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:43:47 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Ceq7u-0003XC-3Y
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:32:42 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Ceq3f-00086F-0j
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 02:28:19 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1Ceq7n-0003Ud-R7
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 02:32:36 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Ceq7n-0003T4-H2
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 02:32:35 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Ceptw-0003oQ-5B
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 02:18:16 -0500
To: grep-cvs-diffs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1Ceq7n-0003Ud-R7@monty-python.gnu.org>
Date: Thu, 16 Dec 2004 02:32:36 -0500
Cc: 
Subject: Changes to grep/lib/regex.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: Thu, 16 Dec 2004 07:43:55 -0000

Index: grep/lib/regex.c
diff -u grep/lib/regex.c:1.3 grep/lib/regex.c:1.4
--- grep/lib/regex.c:1.3	Mon Apr  2 18:04:45 2001
+++ grep/lib/regex.c	Thu Dec 16 07:18:15 2004
@@ -60,6 +60,10 @@
 #ifdef MBS_SUPPORT
 # define CHAR_TYPE wchar_t
 # define US_CHAR_TYPE wchar_t/* unsigned character type */
+# define CHAR_T_SIGN (1 << (sizeof(CHAR_TYPE) * 8 - 1))
+# if defined _AIX
+#  define WCHAR_T_NEED_SIGNEXTEND 1
+# endif /* _AIX */
 # define COMPILED_BUFFER_VAR wc_buffer
 # define OFFSET_ADDRESS_SIZE 1 /* the size which STORE_NUMBER macro use */
 # define CHAR_CLASS_SIZE ((__alignof__(wctype_t)+sizeof(wctype_t))/sizeof(CHAR_TYPE)+1)
@@ -618,10 +622,13 @@
 /* ifdef MBS_SUPPORT, we store NUMBER in 1 element.  */
 
 #ifdef MBS_SUPPORT
-# define EXTRACT_NUMBER(destination, source)				\
-  do {									\
-    (destination) = *(source);						\
-  } while (0)
+# ifdef WCHAR_T_NEED_SIGNEXTEND
+#  define EXTRACT_NUMBER(destination, source)				\
+     (destination) = (*(source) ^ CHAR_T_SIGN) - CHAR_T_SIGN;
+# else
+#  define EXTRACT_NUMBER(destination, source)				\
+     (destination) = *(source)
+# endif /* WCHAR_T_NEED_SIGNEXTEND */
 #else
 # define EXTRACT_NUMBER(destination, source)				\
   do {									\
@@ -638,7 +645,11 @@
     US_CHAR_TYPE *source;
 {
 #ifdef MBS_SUPPORT
+# ifdef WCHAR_T_NEED_SIGNEXTEND
+  *dest = (*source ^ CHAR_T_SIGN) - CHAR_T_SIGN;
+# else
   *dest = *source;
+# endif /* WCHAR_T_NEED_SIGNEXTEND */
 #else
   int temp = SIGN_EXTEND_CHAR (*(source + 1));
   *dest = *source & 0377;



From MAILER-DAEMON Thu Dec 16 02:44:00 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CeqIq-00083O-C2
	for mharc-grep-commit@gnu.org; Thu, 16 Dec 2004 02:44:00 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CeqIk-000802-Pn
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:43:54 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CeqIe-0007vs-Qy
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:43:52 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CeqId-0007vL-G9
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:43:47 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Ceq7u-0003Xm-Rl
	for grep-commit@gnu.org; Thu, 16 Dec 2004 02:32:42 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Ceq3f-00086F-Q5
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 02:28:19 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1Ceq7m-0003Tq-Ed
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 02:32:34 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Ceq7m-0003T4-4o
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 02:32:34 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Ceptw-0003oe-NY
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 02:18:16 -0500
To: grep-cvs-diffs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1Ceq7m-0003Tq-Ed@monty-python.gnu.org>
Date: Thu, 16 Dec 2004 02:32:34 -0500
Cc: 
Subject: Changes to grep/src/search.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: Thu, 16 Dec 2004 07:43:56 -0000

Index: grep/src/search.c
diff -u grep/src/search.c:1.29 grep/src/search.c:1.30
--- grep/src/search.c:1.29	Mon Nov 22 13:40:56 2004
+++ grep/src/search.c	Thu Dec 16 07:18:15 2004
@@ -153,14 +153,16 @@
 {
   char *mb_properties = xmalloc(size);
   mbstate_t cur_state;
+  wchar_t wc;
   int i;
 
   memset(&cur_state, 0, sizeof(mbstate_t));
   memset(mb_properties, 0, sizeof(char)*size);
+
   for (i = 0; i < size ;)
     {
       size_t mbclen;
-      mbclen = mbrlen(buf + i, size - i, &cur_state);
+      mbclen = mbrtowc(&wc, buf + i, size - i, &cur_state);
 
       if (mbclen == (size_t) -1 || mbclen == (size_t) -2 || mbclen == 0)
 	{
@@ -168,6 +170,14 @@
 	     We treat it as a singlebyte character.  */
 	  mbclen = 1;
 	}
+      else if (match_icase)
+	{
+	  if (iswupper((wint_t)wc))
+	    {
+	      wc = towlower((wint_t)wc);
+	      wcrtomb(buf + i, wc, &cur_state);
+	    }
+	}
       mb_properties[i] = mbclen;
       i += mbclen;
     }
@@ -342,14 +352,20 @@
   char eol = eolbyte;
   int backref, start, len;
   struct kwsmatch kwsm;
-  size_t i;
+  size_t i, ret_val;
 #ifdef MBS_SUPPORT
   char *mb_properties = NULL;
-#endif /* MBS_SUPPORT */
-
-#ifdef MBS_SUPPORT
-  if (MB_CUR_MAX > 1 && kwset)
-    mb_properties = check_multibyte_string(buf, size);
+  if (MB_CUR_MAX > 1)
+    {
+      if (match_icase)
+        {
+          char *case_buf = malloc(size);
+          memcpy(case_buf, buf, size);
+          buf = case_buf;
+        }
+      if (kwset)
+        mb_properties = check_multibyte_string(buf, size);
+    }
 #endif /* MBS_SUPPORT */
 
   buflim = buf + size;
@@ -366,8 +382,12 @@
 		{
 #ifdef MBS_SUPPORT
 		  if (MB_CUR_MAX > 1)
-		    free(mb_properties);
-#endif
+                    {
+                      if (match_icase)
+                        free ((char*)buf);
+                      free(mb_properties);
+                    }
+#endif /* MBS_SUPPORT */
 		  return (size_t)-1;
 		}
 	      beg += offset;
@@ -465,18 +485,29 @@
 	} /* for Regex patterns.  */
     } /* for (beg = end ..) */
 #ifdef MBS_SUPPORT
-  if (MB_CUR_MAX > 1 && mb_properties)
-    free (mb_properties);
+  if (MB_CUR_MAX > 1)
+    {
+      if (match_icase)
+        free((char*)buf);
+      if (mb_properties)
+        free(mb_properties);
+    }
 #endif /* MBS_SUPPORT */
   return (size_t) -1;
 
  success:
+  ret_val = beg - buf;
 #ifdef MBS_SUPPORT
-  if (MB_CUR_MAX > 1 && mb_properties)
-    free (mb_properties);
+  if (MB_CUR_MAX > 1)
+    {
+      if (match_icase)
+        free((char*)buf);
+      if (mb_properties)
+        free(mb_properties);
+    }
 #endif /* MBS_SUPPORT */
   *match_size = end - beg;
-  return beg - buf;
+  return ret_val;
 }
 
 static void
@@ -509,10 +540,19 @@
   register size_t len;
   char eol = eolbyte;
   struct kwsmatch kwsmatch;
+  size_t ret_val;
 #ifdef MBS_SUPPORT
-  char *mb_properties;
+  char *mb_properties = NULL;
   if (MB_CUR_MAX > 1)
-    mb_properties = check_multibyte_string (buf, size);
+    {
+      if (match_icase)
+        {
+          char *case_buf = malloc(size);
+          memcpy(case_buf, buf, size);
+          buf = case_buf;
+        }
+      mb_properties = check_multibyte_string(buf, size);
+    }
 #endif /* MBS_SUPPORT */
 
   for (beg = buf; beg <= buf + size; ++beg)
@@ -521,8 +561,12 @@
       if (offset == (size_t) -1)
 	{
 #ifdef MBS_SUPPORT
-	  if (MB_CUR_MAX > 1)
-	    free(mb_properties);
+          if (MB_CUR_MAX > 1)
+            {
+              if (match_icase)
+                free ((char*)buf);
+              free(mb_properties);
+            }
 #endif /* MBS_SUPPORT */
 	  return offset;
 	}
@@ -535,11 +579,16 @@
       if (exact)
 	{
 	  *match_size = len;
+          ret_val = beg - buf;
 #ifdef MBS_SUPPORT
-	  if (MB_CUR_MAX > 1)
-	    free (mb_properties);
+          if (MB_CUR_MAX > 1)
+            {
+              if (match_icase)
+                free ((char*)buf);
+              free(mb_properties);
+            }
 #endif /* MBS_SUPPORT */
-	  return beg - buf;
+	  return ret_val;
 	}
       if (match_lines)
 	{
@@ -560,8 +609,12 @@
 		if (offset == (size_t) -1)
 		  {
 #ifdef MBS_SUPPORT
-		    if (MB_CUR_MAX > 1)
-		      free (mb_properties);
+                    if (MB_CUR_MAX > 1)
+                      {
+                        if (match_icase)
+                          free ((char*)buf);
+                        free(mb_properties);
+                      }
 #endif /* MBS_SUPPORT */
 		    return offset;
 		  }
@@ -577,7 +630,12 @@
 
 #ifdef MBS_SUPPORT
   if (MB_CUR_MAX > 1)
-    free (mb_properties);
+    {
+      if (match_icase)
+        free((char*)buf);
+      if (mb_properties)
+        free(mb_properties);
+    }
 #endif /* MBS_SUPPORT */
   return -1;
 
@@ -587,11 +645,17 @@
   while (buf < beg && beg[-1] != eol)
     --beg;
   *match_size = end - beg;
+  ret_val = beg - buf;
 #ifdef MBS_SUPPORT
   if (MB_CUR_MAX > 1)
-    free (mb_properties);
+    {
+      if (match_icase)
+        free((char*)buf);
+      if (mb_properties)
+        free(mb_properties);
+    }
 #endif /* MBS_SUPPORT */
-  return beg - buf;
+  return ret_val;
 }
 
 #if HAVE_LIBPCRE



From MAILER-DAEMON Thu Dec 16 03:49:09 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CerJs-0001y5-Ge
	for mharc-grep-commit@gnu.org; Thu, 16 Dec 2004 03:49:08 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CerJn-0001wm-8x
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:49:03 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CerJi-0001ve-Dt
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:48:59 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CerJi-0001uS-BD
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:48:58 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Cer8x-0007L9-IH
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:37:51 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Cer4i-0001gZ-9i
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:33:28 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1Cer8f-0007AN-QV
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:37:34 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Cer8f-0007AJ-EO
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:37:33 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CeqrB-0000XC-TI
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:19:30 -0500
To: grep-cvs-diffs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1Cer8f-0007AN-QV@monty-python.gnu.org>
Date: Thu, 16 Dec 2004 03:37:34 -0500
Cc: 
Subject: Changes to grep/src/dfa.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: Thu, 16 Dec 2004 08:49:04 -0000

Index: grep/src/dfa.c
diff -u grep/src/dfa.c:1.30 grep/src/dfa.c:1.31
--- grep/src/dfa.c:1.30	Thu Dec 16 07:18:15 2004
+++ grep/src/dfa.c	Thu Dec 16 08:19:29 2004
@@ -365,7 +365,6 @@
    reader is referred to the GNU Regex documentation for the
    meaning of the @#%!@#%^!@ syntax bits. */
 
-static char const *lexstart;	/* Pointer to beginning of input string. */
 static char const *lexptr;	/* Pointer to next input character. */
 static int lexleft;		/* Number of characters remaining. */
 static token lasttok;		/* Previous token returned; initially END. */
@@ -383,7 +382,7 @@
 static int cur_mb_index;        /* Byte index of the current scanning multibyte
                                    character.
 
-				   singlebyte character : cur_mb_index = 0
+				   single byte character : cur_mb_index = 0
 				   multibyte character
 				       1st byte : cur_mb_index = 1
 				       2nd byte : cur_mb_index = 2
@@ -394,7 +393,7 @@
 				   byte of corresponding multibyte character
 				   in the input string.  A element's value
 				   is 0 if corresponding character is a
-				   singlebyte chracter.
+				   single byte chracter.
 				   e.g. input : 'a', <mb(0)>, <mb(1)>, <mb(2)>
 				    mblen_buf :   0,       3,       2,       1
 				*/
@@ -432,10 +431,10 @@
 	   cur_mb_len was already set by mbrlen().  */
 	cur_mb_index = 1;
       else if (cur_mb_len < 1)
-	/* Invalid sequence.  We treat it as a singlebyte character.
+	/* Invalid sequence.  We treat it as a single byte character.
 	   cur_mb_index is aleady 0.  */
 	cur_mb_len = 1;
-      /* Otherwise, cur_mb_len == 1, it is a singlebyte character.
+      /* Otherwise, cur_mb_len == 1, it is a single byte character.
 	 cur_mb_index is aleady 0.  */
     }
 }
@@ -528,7 +527,8 @@
 
   work_mbc->nchars = work_mbc->nranges = work_mbc->nch_classes = 0;
   work_mbc->nequivs = work_mbc->ncoll_elems = 0;
-  work_mbc->chars = work_mbc->ch_classes = NULL;
+  work_mbc->chars = NULL;
+  work_mbc->ch_classes = NULL;
   work_mbc->range_sts = work_mbc->range_ends = NULL;
   work_mbc->equivs = work_mbc->coll_elems = NULL;
 
@@ -1098,15 +1098,17 @@
 			  setbit_case_fold (c, ccl);
 		      } else {
 			/* POSIX locales are painful - leave the decision to libc */
-			char expr[6] = { '[', 0 /* c */, '-', 0 /* c2 */, ']', '\0' };
 			regex_t re;
-			expr[1] = c;
-			expr[3] = c2;
+			char expr[6]; /* = { '[', c, '-', c2, ']', '\0' }; */
+
+			expr[0] = '['; expr[1] = c; expr[2] = '-';
+			expr[3] = c2; expr[4] = ']'; expr[5] = '\0';
 			if (regcomp (&re, expr, case_fold ? REG_ICASE : 0) == REG_NOERROR) {
 			  for (c = 0; c < NOTCHAR; ++c) {
-			    char buf[2] = { 0 /* c */, '\0' };
 			    regmatch_t mat;
-			    buf[0] = c;
+			    char buf[2]; /* = { c, '\0' }; */
+
+			    buf[0] = c; buf[1] = '\0';
 			    if (regexec (&re, buf, 1, &mat, 0) == REG_NOERROR
                                && mat.rm_so == 0 && mat.rm_eo == 1)
                               setbit_case_fold (c, ccl);
@@ -1179,8 +1181,8 @@
 	  : (((cur_mb_index == 1)? 1 : 0) /* 1st-byte of multibyte char */
 	     + ((cur_mb_index == cur_mb_len)? 2 : 0)); /* last-byte */
       else
-	/* It may be unnecesssary, but it is safer to treat other
-	   symbols as singlebyte characters.  */
+	/* It may be unnecessary, but it is safer to treat other
+	   symbols as single byte characters.  */
 	dfa->multibyte_prop[dfa->tindex] = 3;
     }
 #endif
@@ -1406,7 +1408,7 @@
 dfaparse (char const *s, size_t len, struct dfa *d)
 {
   dfa = d;
-  lexstart = lexptr = s;
+  lexptr = s;
   lexleft = len;
   lasttok = END;
   laststart = 1;
@@ -2000,7 +2002,7 @@
   int state_letter;		/* New state on a letter transition. */
   static int initialized;	/* Flag for static initialization. */
 #ifdef MBS_SUPPORT
-  int next_isnt_1st_byte = 0;	/* Flag If we can't add state0.  */
+  int next_isnt_1st_byte = 0;	/* Flag if we can't add state0.  */
 #endif
   int i, j, k;
 
@@ -2183,11 +2185,11 @@
 	     character, or the states of follows must accept the bytes
 	     which are not 1st byte of the multibyte character.
 	     Then, if a state of follows encounter a byte, it must not be
-	     a 1st byte of a multibyte character nor singlebyte character.
+	     a 1st byte of a multibyte character nor single byte character.
 	     We cansel to add state[0].follows to next state, because
 	     state[0] must accept 1st-byte
 
-	     For example, we assume <sb a> is a certain singlebyte
+	     For example, we assume <sb a> is a certain single byte
 	     character, <mb A> is a certain multibyte character, and the
 	     codepoint of <sb a> equals the 2nd byte of the codepoint of
 	     <mb A>.
@@ -2363,12 +2365,12 @@
 #ifdef MBS_SUPPORT
 /* Multibyte character handling sub-routines for dfaexec.  */
 
-/* Initial state may encounter the byte which is not a singlebyte character
+/* Initial state may encounter the byte which is not a single byte character
    nor 1st byte of a multibyte character.  But it is incorrect for initial
    state to accept such a byte.
    For example, in sjis encoding the regular expression like "\\" accepts
    the codepoint 0x5c, but should not accept the 2nd byte of the codepoint
-   0x815c. Then Initial state must skip the bytes which are not a singlebyte
+   0x815c. Then Initial state must skip the bytes which are not a single byte
    character nor 1st byte of a multibyte character.  */
 #define SKIP_REMAINS_MB_IF_INITIAL_STATE(s, p)		\
   if (s == 0)						\
@@ -2733,7 +2735,7 @@
 
   if (nelem == 0 || maxlen == 0)
     /* This state has no multibyte operator which can match.
-       We need to check only one singlebyte character.  */
+       We need to check only one single byte character.  */
     {
       status_transit_state rs;
       rs = transit_state_singlebyte(d, s, *pp, &s1);



From MAILER-DAEMON Thu Dec 16 03:51:14 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CerLu-0002LF-2t
	for mharc-grep-commit@gnu.org; Thu, 16 Dec 2004 03:51:14 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CerLo-0002KH-Ku
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:51:08 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CerLk-0002Jc-JZ
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:51:05 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CerLk-0002Iu-49
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:51:04 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1CerAp-0008K1-Tj
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:39:48 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Cer6a-0002bb-JE
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:35:24 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1CerAQ-0008AC-HW
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:39:23 -0500
Received: from [199.232.41.5] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CerAQ-0007TM-6U
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:39:22 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.34) id 1CequC-0002nM-LQ
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:22:36 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CeqrC-0000XS-Rc
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:19:31 -0500
To: grep-cvs-diffs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1CerAQ-0008AC-HW@monty-python.gnu.org>
Date: Thu, 16 Dec 2004 03:39:23 -0500
Cc: 
Subject: Changes to grep/src/search.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: Thu, 16 Dec 2004 08:51:10 -0000

Index: grep/src/search.c
diff -u grep/src/search.c:1.30 grep/src/search.c:1.31
--- grep/src/search.c:1.30	Thu Dec 16 07:18:15 2004
+++ grep/src/search.c	Thu Dec 16 08:19:29 2004
@@ -146,7 +146,7 @@
 #ifdef MBS_SUPPORT
 /* This function allocate the array which correspond to "buf".
    Then this check multibyte string and mark on the positions which
-   are not singlebyte character nor the first byte of a multibyte
+   are not single byte character nor the first byte of a multibyte
    character.  Caller must free the array.  */
 static char*
 check_multibyte_string(char const *buf, size_t size)
@@ -167,7 +167,7 @@
       if (mbclen == (size_t) -1 || mbclen == (size_t) -2 || mbclen == 0)
 	{
 	  /* An invalid sequence, or a truncated multibyte character.
-	     We treat it as a singlebyte character.  */
+	     We treat it as a single byte character.  */
 	  mbclen = 1;
 	}
       else if (match_icase)



From MAILER-DAEMON Thu Dec 16 03:51:14 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CerLt-0002L4-Mk
	for mharc-grep-commit@gnu.org; Thu, 16 Dec 2004 03:51:13 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CerLo-0002KG-LY
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:51:08 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CerLk-0002JS-3x
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:51:04 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CerLj-0002Iu-R1
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:51:03 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1CerAq-0008KC-4z
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:39:48 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Cer6a-0002bb-S3
	for grep-cvs-logs@gnu.org; Thu, 16 Dec 2004 03:35:24 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1CerAR-0008AR-5i
	for grep-cvs-logs@gnu.org; Thu, 16 Dec 2004 03:39:23 -0500
Received: from [199.232.41.5] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CerAQ-0007TM-TL
	for grep-cvs-logs@gnu.org; Thu, 16 Dec 2004 03:39:23 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.34) id 1CequC-0002nM-36
	for grep-cvs-logs@gnu.org; Thu, 16 Dec 2004 03:22:36 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CeqrD-0000XZ-5b
	for grep-cvs-logs@gnu.org; Thu, 16 Dec 2004 03:19:31 -0500
To: grep-cvs-logs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1CerAR-0008AR-5i@monty-python.gnu.org>
Date: Thu, 16 Dec 2004 03:39:23 -0500
Cc: 
Subject: grep ./ChangeLog src/dfa.c src/dfa.h 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: Thu, 16 Dec 2004 08:51:09 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Stepan Kasal <kasal@ucw.cz>	04/12/16 08:19:29

Modified files:
	.              : ChangeLog 
	src            : dfa.c dfa.h grep.c search.c 

Log message:
	small changes from gawk

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.210&tr2=1.211&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/dfa.c.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/dfa.h.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/grep.c.diff?tr1=1.90&tr2=1.91&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/search.c.diff?tr1=1.30&tr2=1.31&r1=text&r2=text




From MAILER-DAEMON Thu Dec 16 03:51:37 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CerMG-0002R6-0s
	for mharc-grep-commit@gnu.org; Thu, 16 Dec 2004 03:51:36 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CerMC-0002PN-Ua
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:51:33 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CerMB-0002Oy-Qk
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:51:32 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CerMB-0002Or-IH
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:51:31 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1CerAk-0008HY-Sh
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:39:42 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Cer6V-0002bb-KL
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:35:19 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1CerAi-0008G5-Am
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:39:40 -0500
Received: from [199.232.41.5] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CerAi-0007TM-3r
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:39:40 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.34) id 1CeqrC-0002fj-Au
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:19:30 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CeqrC-0000XH-5q
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:19:30 -0500
To: grep-cvs-diffs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1CerAi-0008G5-Am@monty-python.gnu.org>
Date: Thu, 16 Dec 2004 03:39:40 -0500
Cc: 
Subject: Changes to grep/src/dfa.h
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, 16 Dec 2004 08:51:33 -0000

Index: grep/src/dfa.h
diff -u grep/src/dfa.h:1.7 grep/src/dfa.h:1.8
--- grep/src/dfa.h:1.7	Wed Mar  7 04:11:27 2001
+++ grep/src/dfa.h	Thu Dec 16 08:19:29 2004
@@ -150,7 +150,7 @@
 
 #ifdef MBS_SUPPORT
   ANYCHAR,                     /* ANYCHAR is a terminal symbol that matches
-                                  any multibyte(or singlebyte) characters.
+                                  any multibyte (or single byte) characters.
 			          It is used only if MB_CUR_MAX > 1.  */
 
   MBCSET,			/* MBCSET is similar to CSET, but for
@@ -305,9 +305,9 @@
   int *multibyte_prop;
   /* The value of multibyte_prop[i] is defined by following rule.
        if tokens[i] < NOTCHAR
-         bit 1 : tokens[i] is a singlebyte character, or the last-byte of
+         bit 1 : tokens[i] is a single byte character, or the last-byte of
 	         a multibyte character.
-	 bit 0 : tokens[i] is a singlebyte character, or the 1st-byte of
+	 bit 0 : tokens[i] is a single byte character, or the 1st-byte of
 	         a multibyte character.
        if tokens[i] = MBCSET
          ("the index of mbcsets correspnd to this operator" << 2) + 3



From MAILER-DAEMON Thu Dec 16 03:51:41 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CerMI-0002SF-TO
	for mharc-grep-commit@gnu.org; Thu, 16 Dec 2004 03:51:39 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CerMD-0002Pj-Qs
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:51:34 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CerMC-0002PF-D2
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:51:32 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CerMC-0002Or-5O
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:51:32 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1CerAl-0008Hp-8q
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:39:43 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Cer6V-0002bb-Vx
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:35:20 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1CerAh-0008Fe-T1
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:39:40 -0500
Received: from [199.232.41.5] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CerAh-0007TM-NS
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:39:39 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.34) id 1CeqrC-0002fj-Q9
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:19:30 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CeqrC-0000XN-Kd
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:19:30 -0500
To: grep-cvs-diffs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1CerAh-0008Fe-T1@monty-python.gnu.org>
Date: Thu, 16 Dec 2004 03:39:40 -0500
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: Thu, 16 Dec 2004 08:51:35 -0000

Index: grep/src/grep.c
diff -u grep/src/grep.c:1.90 grep/src/grep.c:1.91
--- grep/src/grep.c:1.90	Thu Dec 16 07:18:15 2004
+++ grep/src/grep.c	Thu Dec 16 08:19:29 2004
@@ -1750,7 +1750,7 @@
 	  if (mbclen == (size_t) -1 || mbclen == (size_t) -2 || mbclen == 0)
 	    {
 	      /* An invalid sequence, or a truncated multibyte character.
-		 We treat it as a singlebyte character.  */
+		 We treat it as a single byte character.  */
 	      mbclen = 1;
 	    }
 	  else



From MAILER-DAEMON Thu Dec 16 03:51:43 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1CerML-0002Se-K0
	for mharc-grep-commit@gnu.org; Thu, 16 Dec 2004 03:51:42 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1CerMF-0002QV-4L
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:51:35 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1CerMD-0002PQ-7i
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:51:33 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1CerMC-0002Or-Em
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:51:32 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1CerAk-0008Gy-0W
	for grep-commit@gnu.org; Thu, 16 Dec 2004 03:39:42 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Cer6U-0002bb-Mn
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:35:18 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1CerAi-0008GT-Sd
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:39:41 -0500
Received: from [199.232.41.5] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1CerAi-0007TM-Kn
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:39:40 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.34) id 1CeqrB-0002fe-JG
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:19:29 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1CeqrB-0000X7-Dc
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 03:19:29 -0500
To: grep-cvs-diffs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1CerAi-0008GT-Sd@monty-python.gnu.org>
Date: Thu, 16 Dec 2004 03:39:41 -0500
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, 16 Dec 2004 08:51:36 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.210 grep/ChangeLog:1.211
--- grep/ChangeLog:1.210	Thu Dec 16 07:18:15 2004
+++ grep/ChangeLog	Thu Dec 16 08:19:29 2004
@@ -1,3 +1,15 @@
+2004-12-16  Stepan Kasal  <kasal@ucw.cz>
+
+	Cosmetic changes, mostly imported from gawk:
+
+	* src/dfa.c (lexstart): Removed unused variable.
+	(parse_bracket_exp_mb): Don't initialize different pointers in one
+	  assignment
+	(lex): Don't initialize automatic arrays, it's invalid in pre-C89
+	  compilers.
+	Various other typos.
+	* src/dfa.h, src/grep.c, src/search.c: Typos.
+
 2004-12-16  Isamu Hasegawa  <isamuh@jp.ibm.com>
 
 	From http://oss.software.ibm.com/linux/patches/?patch_id=25



From MAILER-DAEMON Thu Dec 16 04:33:19 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1Ces0d-0001os-8m
	for mharc-grep-commit@gnu.org; Thu, 16 Dec 2004 04:33:19 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1Ces0R-0001k2-FS
	for grep-commit@gnu.org; Thu, 16 Dec 2004 04:33:08 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1Ces0N-0001hf-4i
	for grep-commit@gnu.org; Thu, 16 Dec 2004 04:33:04 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1Ces0M-0001gm-8j
	for grep-commit@gnu.org; Thu, 16 Dec 2004 04:33:02 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Ceror-0003SL-74
	for grep-commit@gnu.org; Thu, 16 Dec 2004 04:21:09 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Cerkb-0008WC-N5
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 04:16:45 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1Cero8-0003B5-3H
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 04:20:25 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Cero7-0003Aw-Nf
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 04:20:23 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Cero7-0005n7-Bn
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 04:20:23 -0500
To: grep-cvs-diffs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1Cero8-0003B5-3H@monty-python.gnu.org>
Date: Thu, 16 Dec 2004 04:20:25 -0500
Cc: 
Subject: Changes to grep/src/dfa.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: Thu, 16 Dec 2004 09:33:10 -0000

Index: grep/src/dfa.c
diff -u grep/src/dfa.c:1.31 grep/src/dfa.c:1.32
--- grep/src/dfa.c:1.31	Thu Dec 16 08:19:29 2004
+++ grep/src/dfa.c	Thu Dec 16 09:20:23 2004
@@ -2702,7 +2702,7 @@
 
 /* Transit state from s, then return new state and update the pointer of the
    buffer.  This function is for some operator which can match with a multi-
-   byte character or a collating element(which may be multi characters).  */
+   byte character or a collating element (which may be multi characters).  */
 static int
 transit_state (struct dfa *d, int s, unsigned char const **pp)
 {
@@ -2786,7 +2786,7 @@
   return s1;
 }
 
-#endif
+#endif /* MBS_SUPPORT */
 
 /* Search through a buffer looking for a match to the given struct dfa.
    Find the first occurrence of a string matching the regexp in the buffer,



From MAILER-DAEMON Thu Dec 16 19:10:54 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1Cf5hs-0004LX-2d
	for mharc-grep-commit@gnu.org; Thu, 16 Dec 2004 19:10:52 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1Cf5hm-0004JM-RQ
	for grep-commit@gnu.org; Thu, 16 Dec 2004 19:10:47 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1Cf5hl-0004I1-6j
	for grep-commit@gnu.org; Thu, 16 Dec 2004 19:10:45 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1Cf5hk-0004H5-IX
	for grep-commit@gnu.org; Thu, 16 Dec 2004 19:10:44 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Cf5WZ-0004en-J4
	for grep-commit@gnu.org; Thu, 16 Dec 2004 18:59:11 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Cf5SG-0001SV-3e
	for grep-cvs-logs@gnu.org; Thu, 16 Dec 2004 18:54:44 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1Cf5W9-0004OM-FX
	for grep-cvs-logs@gnu.org; Thu, 16 Dec 2004 18:58:46 -0500
Received: from [199.232.41.5] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Cf5W9-00049f-Al
	for grep-cvs-logs@gnu.org; Thu, 16 Dec 2004 18:58:45 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.34) id 1Cero8-0007HM-1n
	for grep-cvs-logs@gnu.org; Thu, 16 Dec 2004 04:20:24 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Cero7-0005nB-TE
	for grep-cvs-logs@gnu.org; Thu, 16 Dec 2004 04:20:24 -0500
To: grep-cvs-logs@gnu.org
From: Stepan Kasal <kasal@ucw.cz>
Message-Id: <E1Cf5W9-0004OM-FX@monty-python.gnu.org>
Date: Thu, 16 Dec 2004 18:58:46 -0500
Cc: 
Subject: grep/src dfa.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: Fri, 17 Dec 2004 00:10:48 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Stepan Kasal <kasal@ucw.cz>	04/12/16 09:20:23

Modified files:
	src            : dfa.c 

Log message:
	cosmetics

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/dfa.c.diff?tr1=1.31&tr2=1.32&r1=text&r2=text




From MAILER-DAEMON Thu Dec 16 19:49:23 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1Cf6J7-0003Fl-7S
	for mharc-grep-commit@gnu.org; Thu, 16 Dec 2004 19:49:21 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1Cf6Iz-000395-NT
	for grep-commit@gnu.org; Thu, 16 Dec 2004 19:49:15 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1Cf6It-0002zu-1w
	for grep-commit@gnu.org; Thu, 16 Dec 2004 19:49:07 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1Cf6Is-0002yh-RH
	for grep-commit@gnu.org; Thu, 16 Dec 2004 19:49:06 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Cf68H-0000St-Fx
	for grep-commit@gnu.org; Thu, 16 Dec 2004 19:38:09 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Cf63x-00086X-Qa
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 19:33:41 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1Cf67a-0000Js-Hw
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 19:37:26 -0500
Received: from [199.232.41.4] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Cf67a-0000Jm-C1
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 19:37:26 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Cf67a-0005EM-3t
	for grep-cvs-diffs@gnu.org; Thu, 16 Dec 2004 19:37:26 -0500
To: grep-cvs-diffs@gnu.org
From: Julian Foad <julianfoad@btopenworld.com>
Message-Id: <E1Cf67a-0000Js-Hw@monty-python.gnu.org>
Date: Thu, 16 Dec 2004 19:37:26 -0500
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: Fri, 17 Dec 2004 00:49:17 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.211 grep/ChangeLog:1.212
--- grep/ChangeLog:1.211	Thu Dec 16 08:19:29 2004
+++ grep/ChangeLog	Fri Dec 17 00:37:25 2004
@@ -21,6 +21,8 @@
 
 2004-12-15  Julian Foad  <julianfoad@btopenworld.com>
 
+	Changes to documentation and help text, mostly from Stepan Kasal.
+
 	* doc/grep.texi: Minor fixes of phrasing.
 	* doc/grep.1: Likewise.
 	* src/grep.c: Likewise.
@@ -147,6 +149,7 @@
 2003-06-12  Bernhard Rosenkraenzer <bero@arklinux.org>
 	* README-alpha: Mention bug tracking system and grep-devel-list
 	* tests/spencer1.tests: Fix test 55, as noted by Tim Waugh
+	* src/search.c: Speed up multibyte support (Patch from Tim Waugh)
 
 2003-06-05  Stepan Kasal  <kasal@ucw.cz>
 	* tests/formatbre.awk, tests/formatere.awk: probably unused, so
@@ -160,7 +163,6 @@
 
 2003-05-30  Bernhard Rosenkraenzer <bero@arklinux.org>
 	* src/dfa.c: Speed up multibyte support (Patch from Tim Waugh)
-	* src/search.c: Speed up multibyte support (Patch from Tim Waugh)
 
 2003-01-18  Bernhard Rosenkraenzer <bero@arklinux.org>
 	* src/grep.c: Fix -i -o combination (Patch from Tim Waugh)



From MAILER-DAEMON Thu Dec 16 19:49:24 2004
Received: from mailman by lists.gnu.org with archive (Exim 4.33)
	id 1Cf6J8-0003Ge-SB
	for mharc-grep-commit@gnu.org; Thu, 16 Dec 2004 19:49:23 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33)
	id 1Cf6J0-0003B4-Tb
	for grep-commit@gnu.org; Thu, 16 Dec 2004 19:49:15 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33)
	id 1Cf6It-00030L-CR
	for grep-commit@gnu.org; Thu, 16 Dec 2004 19:49:07 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.33) id 1Cf6It-0002yh-0W
	for grep-commit@gnu.org; Thu, 16 Dec 2004 19:49:07 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Cf68G-0000SX-Q7
	for grep-commit@gnu.org; Thu, 16 Dec 2004 19:38:08 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Cf63x-00086X-5i
	for grep-cvs-logs@gnu.org; Thu, 16 Dec 2004 19:33:41 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.34)
	id 1Cf68E-0000Rn-Lf
	for grep-cvs-logs@gnu.org; Thu, 16 Dec 2004 19:38:06 -0500
Received: from [199.232.41.5] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.34) id 1Cf68E-0000RN-Hv
	for grep-cvs-logs@gnu.org; Thu, 16 Dec 2004 19:38:06 -0500
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.34) id 1Cf67b-00016h-5C
	for grep-cvs-logs@gnu.org; Thu, 16 Dec 2004 19:37:27 -0500
Received: from localhost ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 4.34) id 1Cf67a-0005EV-FY
	for grep-cvs-logs@gnu.org; Thu, 16 Dec 2004 19:37:26 -0500
To: grep-cvs-logs@gnu.org
From: Julian Foad <julianfoad@btopenworld.com>
Message-Id: <E1Cf68E-0000Rn-Lf@monty-python.gnu.org>
Date: Thu, 16 Dec 2004 19:38:06 -0500
Cc: 
Subject: 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: Fri, 17 Dec 2004 00:49:17 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Julian Foad <julianfoad@btopenworld.com>	04/12/17 00:37:26

Modified files:
	.              : ChangeLog 

Log message:
	Fix attributions in ChangeLog.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.211&tr2=1.212&r1=text&r2=text




