From MAILER-DAEMON Wed Jun 21 22:01:10 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1dNrQk-0000Vh-8w
	for mharc-grep-commit@gnu.org; Wed, 21 Jun 2017 22:01:10 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43194)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1dNrQg-0000SM-NI
	for grep-commit@gnu.org; Wed, 21 Jun 2017 22:01:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1dNrQe-0007B6-Rm
	for grep-commit@gnu.org; Wed, 21 Jun 2017 22:01:06 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:40685)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1dNrQe-0007Ax-No
	for grep-commit@gnu.org; Wed, 21 Jun 2017 22:01:04 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 69712)
	id 4983920EC0; Wed, 21 Jun 2017 22:01:04 -0400 (EDT)
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v3.0-20-gb0dc886
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c57fba2604b4e1095e869de6c844d8c3d973814f
X-Git-Newrev: b0dc886d9c1fb5df275b5ea9a95c061a5931e50b
Message-Id: <20170622020104.4983920EC0@vcs0.savannah.gnu.org>
Date: Wed, 21 Jun 2017 22:01:03 -0400 (EDT)
From: eggert@cs.ucla.edu (Paul Eggert)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit/>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jun 2017 02:01:08 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  b0dc886d9c1fb5df275b5ea9a95c061a5931e50b (commit)
      from  c57fba2604b4e1095e869de6c844d8c3d973814f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=b0dc886d9c1fb5df275b5ea9a95c061a5931e50b


commit b0dc886d9c1fb5df275b5ea9a95c061a5931e50b
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Wed Jun 21 13:59:57 2017 -0700

    grep: -m no longer cuts off trailing context
    
    Problem reported by Markus Jochim (Bug#26254).
    * NEWS, doc/grep.texi (General Output Control): Document this.
    * src/grep.c (prpending): Selected lines no longer cut off context.
    (usage): Say "selected" instead of "matching", where appropriate.
    * tests/foad1, tests/max-count-vs-context, tests/yesno:
    Adjust to match new behavior.

diff --git a/NEWS b/NEWS
index 0a8cbbc..bd2c00a 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,11 @@ GNU grep NEWS                                    -*- outline -*-
 
 ** Changes in behavior
 
+  Context no longer excludes selected lines omitted because of -m.
+  For example, 'grep "^" -m1 -A1' now outputs the first two input
+  lines, not just the first line.  This fixes a glitch that has been
+  present since -m was added in grep 2.5.
+
   The following changes affect only MS-Windows platforms.  First, the
   --binary (-U) option now governs whether binary I/O is used, instead
   of a heuristic that was sometimes incorrect.  Second, the
diff --git a/doc/grep.texi b/doc/grep.texi
index 728c039..334a059 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -311,11 +311,11 @@ The scanning of each file stops on the first match.
 @opindex -m
 @opindex --max-count
 @cindex max-count
-Stop reading a file after @var{num} matching lines.
+Stop after the first @var{num} selected lines.
 If the input is standard input from a regular file,
-and @var{num} matching lines are output,
+and @var{num} selected lines are output,
 @command{grep} ensures that the standard input is positioned
-just after the last matching line before exiting,
+just after the last selected line before exiting,
 regardless of the presence of trailing context lines.
 This enables a calling process to resume a search.
 For example, the following shell script makes use of it:
@@ -340,10 +340,8 @@ done
 @end example
 
 @cindex context lines
-When @command{grep} stops after @var{num} matching lines,
+When @command{grep} stops after @var{num} selected lines,
 it outputs any trailing context lines.
-Since context does not include matching lines,
-@command{grep} will stop when it encounters another matching line.
 When the @option{-c} or @option{--count} option is also used,
 @command{grep} does not output a count greater than @var{num}.
 When the @option{-v} or @option{--invert-match} option is also used,
diff --git a/src/grep.c b/src/grep.c
index bc2599f..8d22aec 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -1011,7 +1011,7 @@ static intmax_t out_before;	/* Lines of leading context. */
 static intmax_t out_after;	/* Lines of trailing context. */
 static bool count_matches;	/* Count matching lines.  */
 static bool no_filenames;	/* Suppress file names.  */
-static intmax_t max_count;	/* Stop after outputting this many
+static intmax_t max_count;	/* Max number of selected
                                    lines from an input file.  */
 static bool line_buffered;	/* Use line buffering.  */
 static char *label = NULL;      /* Fake filename for stdin */
@@ -1023,7 +1023,7 @@ static char const *lastnl;	/* Pointer after last newline counted. */
 static char *lastout;		/* Pointer after last character output;
                                    NULL if no character has been output
                                    or if it's conceptually before bufbeg. */
-static intmax_t outleft;	/* Maximum number of lines to be output.  */
+static intmax_t outleft;	/* Maximum number of selected lines.  */
 static intmax_t pending;	/* Pending lines of output.
                                    Always kept 0 if out_quiet is true.  */
 static bool done_on_match;	/* Stop scanning file on first match.  */
@@ -1276,25 +1276,16 @@ prline (char *beg, char *lim, char sep)
   lastout = lim;
 }
 
-/* Print pending lines of trailing context prior to LIM. Trailing context ends
-   at the next matching line when OUTLEFT is 0.  */
+/* Print pending lines of trailing context prior to LIM.  */
 static void
 prpending (char const *lim)
 {
   if (!lastout)
     lastout = bufbeg;
-  while (pending > 0 && lastout < lim)
+  for (; 0 < pending && lastout < lim; pending--)
     {
       char *nl = memchr (lastout, eolbyte, lim - lastout);
-      size_t match_size;
-      --pending;
-      if (outleft
-          || ((execute (compiled_pattern, lastout, nl + 1 - lastout,
-                        &match_size, NULL) == (size_t) -1)
-              == !out_invert))
-        prline (lastout, nl + 1, SEP_CHAR_REJECTED);
-      else
-        pending = 0;
+      prline (lastout, nl + 1, SEP_CHAR_REJECTED);
     }
 }
 
@@ -1949,11 +1940,11 @@ Miscellaneous:\n\
       printf (_("\
 \n\
 Output control:\n\
-  -m, --max-count=NUM       stop after NUM matches\n\
+  -m, --max-count=NUM       stop after NUM selected lines\n\
   -b, --byte-offset         print the byte offset with output lines\n\
   -n, --line-number         print line number with output lines\n\
       --line-buffered       flush output on every line\n\
-  -H, --with-filename       print the file name for each match\n\
+  -H, --with-filename       print file name with output lines\n\
   -h, --no-filename         suppress the file name prefix on output\n\
       --label=LABEL         use LABEL as the standard input file name prefix\n\
 "));
@@ -1981,9 +1972,9 @@ Output control:\n\
       --exclude-dir=PATTERN  directories that match PATTERN will be skipped.\n\
 "));
       printf (_("\
-  -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\
+  -L, --files-without-match  print only names of FILEs with no selected lines\n\
+  -l, --files-with-matches  print only names of FILEs with selected lines\n\
+  -c, --count               print only a count of selected lines per FILE\n\
   -T, --initial-tab         make tabs line up (if needed)\n\
   -Z, --null                print 0 byte after FILE name\n"));
       printf (_("\
diff --git a/tests/foad1 b/tests/foad1
index 0163f1a..e399981 100755
--- a/tests/foad1
+++ b/tests/foad1
@@ -93,12 +93,12 @@ grep_test "wordword/" "${CB}word${CE}word/" "\<word" --color=always
 grep_test "4/40/"  "4/40/"  "^4$" -m1 -A99
 grep_test "4/04/"  "4/04/"  "^4$" -m1 -A99
 grep_test "4/444/" "4/444/" "^4$" -m1 -A99
-grep_test "4/40/"  "4/"     "^4"  -m1 -A99
+grep_test "4/40/"  "4/40/"  "^4"  -m1 -A99
 grep_test "4/04/"  "4/04/"  "^4"  -m1 -A99
-grep_test "4/444/" "4/"     "^4"  -m1 -A99
+grep_test "4/444/" "4/444/" "^4"  -m1 -A99
 grep_test "4/40/"  "4/40/"  "4$"  -m1 -A99
-grep_test "4/04/"  "4/"     "4$"  -m1 -A99
-grep_test "4/444/" "4/"     "4$"  -m1 -A99
+grep_test "4/04/"  "4/04/"  "4$"  -m1 -A99
+grep_test "4/444/" "4/444/" "4$"  -m1 -A99
 
 
 # Test for "-F -w" bugs.  Thanks to Gordon Lack for these two.
diff --git a/tests/max-count-vs-context b/tests/max-count-vs-context
index 5633dd6..e80c3ce 100755
--- a/tests/max-count-vs-context
+++ b/tests/max-count-vs-context
@@ -12,7 +12,7 @@ another needle
 6th line...
 EOF
 
-sed 4q in > exp || framework_failure_
+sed 6q in > exp || framework_failure_
 
 fail=0
 grep -m1 -A5 needle in > out 2>err || fail=1
diff --git a/tests/yesno b/tests/yesno
index e379c19..1ae2142 100755
--- a/tests/yesno
+++ b/tests/yesno
@@ -73,14 +73,14 @@ set x \
   '-C,1,--no-gr'    "$rB$C$D$E$rF$rG$H$I$rJ$rL$M$N$z0" \
   '-m,4'            "$C$D$E$H$z0$XI$XJ$XK$XL$XM$XN" \
   '-m,4,-o'         "$c$d$e$h$z0$XI$XJ$XK$XL$XM$XN" \
-  '-m,4,-C,1'       "$rB$C$D$E$rF$rG$H$z0$XI$XJ$XK$XL$XM$XN" \
+  '-m,4,-C,1'       "$rB$C$D$E$rF$rG$H$rI$z0$XI$XJ$XK$XL$XM$XN" \
   '-m,4,-C,1,-o'    "$c$d$e$h$z0$XI$XJ$XK$XL$XM$XN" \
   '-m,5'            "$C$D$E$H$I$z0$XJ$XK$XL$XM$XN" \
   '-m,5,-o'         "$c$d$e$h$i$z0$XJ$XK$XL$XM$XN" \
   '-m,5,-C,1,-o'    "$c$d$e$h$i$z0$XJ$XK$XL$XM$XN" \
   '-m,6'            "$C$D$E$H$I$M$z0$XN" \
   '-m,6,-o'         "$c$d$e$h$i$m$z0$XN" \
-  '-m,6,-C,1'       "$rB$C$D$E$rF$rG$H$I$rJ$s$rL$M$z0$XN" \
+  '-m,6,-C,1'       "$rB$C$D$E$rF$rG$H$I$rJ$s$rL$M$rN$z0$XN" \
   '-m,6,-C,1,-o'    "$c$d$e$h$i$s$m$z0$XN" \
   '-v'              "$A$B$F$G$J$K$L$z0" \
   '-v,-o'           "$z0" \
@@ -92,13 +92,13 @@ set x \
   '-4,-v,-1'        "$A$B$rC$s$rE$F$G$rH$rI$J$K$L$rM$z0" \
   '-m,1,-v'         "$A$z0$XB$XC$XD$XE$XF$XG$XH$XI$XJ$XK$XL$XM$XN" \
   '-m,1,-v,-o'      "$z0$XB$XC$XD$XE$XF$XG$XH$XI$XJ$XK$XL$XM$XN" \
-  '-m,1,-v,-C,1'    "$A$z0$XB$XC$XD$XE$XF$XG$XH$XI$XJ$XK$XL$XM$XN" \
+  '-m,1,-v,-C,1'    "$A$rB$z0$XB$XC$XD$XE$XF$XG$XH$XI$XJ$XK$XL$XM$XN" \
   '-m,1,-v,-C,1,-o' "$z0$XB$XC$XD$XE$XF$XG$XH$XI$XJ$XK$XL$XM$XN" \
   '-m,2,-v'         "$A$B$z0$XC$XD$XE$XF$XG$XH$XI$XJ$XK$XL$XM$XN" \
   '-m,2,-v,-o'      "$z0$XC$XD$XE$XF$XG$XH$XI$XJ$XK$XL$XM$XN" \
   '-m,3,-v'         "$A$B$F$z0$XG$XH$XI$XJ$XK$XL$XM$XN" \
   '-m,3,-v,-o'      "$z0$XG$XH$XI$XJ$XK$XL$XM$XN" \
-  '-m,3,-v,-C,1'    "$A$B$rC$s$rE$F$z0$XG$XH$XI$XJ$XK$XL$XM$XN" \
+  '-m,3,-v,-C,1'    "$A$B$rC$s$rE$F$rG$z0$XG$XH$XI$XJ$XK$XL$XM$XN" \
   '-m,3,-v,-C,1,-o' "$rc$s$re$z0$XG$XH$XI$XJ$XK$XL$XM$XN" \
   x
 shift

-----------------------------------------------------------------------

Summary of changes:
 NEWS                       |  5 +++++
 doc/grep.texi              | 10 ++++------
 src/grep.c                 | 29 ++++++++++-------------------
 tests/foad1                |  8 ++++----
 tests/max-count-vs-context |  2 +-
 tests/yesno                |  8 ++++----
 6 files changed, 28 insertions(+), 34 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Wed Jun 21 23:03:47 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1dNsPL-0006ix-87
	for mharc-grep-commit@gnu.org; Wed, 21 Jun 2017 23:03:47 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52574)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1dNsPI-0006iX-6I
	for grep-commit@gnu.org; Wed, 21 Jun 2017 23:03:45 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1dNsPH-0001bC-3a
	for grep-commit@gnu.org; Wed, 21 Jun 2017 23:03:44 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:41244)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1dNsPH-0001b6-0H
	for grep-commit@gnu.org; Wed, 21 Jun 2017 23:03:43 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 69698)
	id B4C7520C51; Wed, 21 Jun 2017 23:03:42 -0400 (EDT)
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v3.0-22-gbe203db
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b0dc886d9c1fb5df275b5ea9a95c061a5931e50b
X-Git-Newrev: be203db8a6435472f296793dae0a8a23f6a938c4
Message-Id: <20170622030342.B4C7520C51@vcs0.savannah.gnu.org>
Date: Wed, 21 Jun 2017 23:03:42 -0400 (EDT)
From: jim@meyering.net (Jim Meyering)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit/>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Jun 2017 03:03:45 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  be203db8a6435472f296793dae0a8a23f6a938c4 (commit)
       via  438dd525f5f9a167983b2a577fd92872052a4ffc (commit)
      from  b0dc886d9c1fb5df275b5ea9a95c061a5931e50b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=be203db8a6435472f296793dae0a8a23f6a938c4


commit be203db8a6435472f296793dae0a8a23f6a938c4
Author: Jim Meyering <meyering@fb.com>
Date:   Wed Jun 21 09:36:28 2017 -0700

    doc: correct typo
    
    * doc/grep.texi (Performance): s/suprisingly/surprisingly/

diff --git a/doc/grep.texi b/doc/grep.texi
index 334a059..28413e0 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -1817,7 +1817,7 @@ particularly efficient, as @command{grep} is tuned for that locale.
 @cindex case insensitive search
 Outside the @samp{C} locale, case-insensitive search, and search for
 bracket expressions like @samp{[a-z]} and @samp{[[=a=]b]}, can be
-suprisingly inefficient due to difficulties in fast portable access to
+surprisingly inefficient due to difficulties in fast portable access to
 concepts like multi-character collating elements.
 
 @cindex back-references

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=438dd525f5f9a167983b2a577fd92872052a4ffc


commit be203db8a6435472f296793dae0a8a23f6a938c4
Author: Jim Meyering <meyering@fb.com>
Date:   Wed Jun 21 09:36:28 2017 -0700

    doc: correct typo
    
    * doc/grep.texi (Performance): s/suprisingly/surprisingly/

diff --git a/doc/grep.texi b/doc/grep.texi
index 334a059..28413e0 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -1817,7 +1817,7 @@ particularly efficient, as @command{grep} is tuned for that locale.
 @cindex case insensitive search
 Outside the @samp{C} locale, case-insensitive search, and search for
 bracket expressions like @samp{[a-z]} and @samp{[[=a=]b]}, can be
-suprisingly inefficient due to difficulties in fast portable access to
+surprisingly inefficient due to difficulties in fast portable access to
 concepts like multi-character collating elements.
 
 @cindex back-references

-----------------------------------------------------------------------

Summary of changes:
 doc/grep.texi | 2 +-
 gnulib        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Sat Jun 24 22:52:39 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1dOxfD-00045b-0a
	for mharc-grep-commit@gnu.org; Sat, 24 Jun 2017 22:52:39 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51993)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1dOxfA-00045R-EN
	for grep-commit@gnu.org; Sat, 24 Jun 2017 22:52:37 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1dOxf9-0004mh-I1
	for grep-commit@gnu.org; Sat, 24 Jun 2017 22:52:36 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:48168)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1dOxf9-0004mb-Eb
	for grep-commit@gnu.org; Sat, 24 Jun 2017 22:52:35 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 69698)
	id 1B705210EB; Sat, 24 Jun 2017 22:52:35 -0400 (EDT)
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v3.0-23-gb00df71
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: be203db8a6435472f296793dae0a8a23f6a938c4
X-Git-Newrev: b00df714d9d811f11682930b43de6ed1ef650e1c
Message-Id: <20170625025235.1B705210EB@vcs0.savannah.gnu.org>
Date: Sat, 24 Jun 2017 22:52:34 -0400 (EDT)
From: jim@meyering.net (Jim Meyering)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit/>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Jun 2017 02:52:37 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  b00df714d9d811f11682930b43de6ed1ef650e1c (commit)
      from  be203db8a6435472f296793dae0a8a23f6a938c4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=b00df714d9d811f11682930b43de6ed1ef650e1c


commit b00df714d9d811f11682930b43de6ed1ef650e1c
Author: Jim Meyering <meyering@fb.com>
Date:   Sat Jun 24 13:05:54 2017 -0700

    doc: stop calling --perl-regexp (-P) "highly" experimental
    
    Use wording that is less likely to make readers think that
    support for -P may be removed.
    * doc/grep.in.1: s/highly experimental/experimental/
    * doc/grep.texi: Likewise.
    Suggested by Evan Sheahan.

diff --git a/doc/grep.in.1 b/doc/grep.in.1
index 367501f..40c9586 100644
--- a/doc/grep.in.1
+++ b/doc/grep.in.1
@@ -108,7 +108,7 @@ This is the default.
 .TP
 .BR \-P ", " \-\^\-perl\-regexp
 Interpret the pattern as a Perl-compatible regular expression (PCRE).
-This is highly experimental and
+This is experimental and
 .B "grep \-P"
 may warn of unimplemented features.
 .SS "Matching Control"
diff --git a/doc/grep.texi b/doc/grep.texi
index 28413e0..abe7eb9 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -1112,7 +1112,7 @@ expressions), separated by newlines, any of which is to be matched.
 @opindex --perl-regexp
 @cindex matching Perl-compatible regular expressions
 Interpret the pattern as a Perl-compatible regular expression (PCRE).
-This is highly experimental, particularly when combined with
+This is experimental, particularly when combined with
 the @option{-z} (@option{--null-data}) option, and
 @samp{grep@ -P} may warn of unimplemented features.
 @xref{Other Options}.

-----------------------------------------------------------------------

Summary of changes:
 doc/grep.in.1 | 2 +-
 doc/grep.texi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Sun Jun 25 18:24:38 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1dPFxO-0007Kv-O5
	for mharc-grep-commit@gnu.org; Sun, 25 Jun 2017 18:24:38 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49746)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1dPFxM-0007Ju-6D
	for grep-commit@gnu.org; Sun, 25 Jun 2017 18:24:37 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1dPFxL-0002gq-57
	for grep-commit@gnu.org; Sun, 25 Jun 2017 18:24:36 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:57199)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1dPFxL-0002gh-1d
	for grep-commit@gnu.org; Sun, 25 Jun 2017 18:24:35 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 69698)
	id CE9D220320; Sun, 25 Jun 2017 18:24:34 -0400 (EDT)
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v3.0-24-g1a725c2
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b00df714d9d811f11682930b43de6ed1ef650e1c
X-Git-Newrev: 1a725c23dff1f1d3f1d5935837ef01eeeb147bc4
Message-Id: <20170625222434.CE9D220320@vcs0.savannah.gnu.org>
Date: Sun, 25 Jun 2017 18:24:34 -0400 (EDT)
From: jim@meyering.net (Jim Meyering)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit/>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Jun 2017 22:24:37 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  1a725c23dff1f1d3f1d5935837ef01eeeb147bc4 (commit)
      from  b00df714d9d811f11682930b43de6ed1ef650e1c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=1a725c23dff1f1d3f1d5935837ef01eeeb147bc4


commit 1a725c23dff1f1d3f1d5935837ef01eeeb147bc4
Author: Jim Meyering <meyering@fb.com>
Date:   Sun Jun 25 14:52:43 2017 -0700

    doc: fix another typo
    
    * doc/grep.texi (File and Directory Selection): Fix typo: s/afer/after/

diff --git a/doc/grep.texi b/doc/grep.texi
index abe7eb9..64df316 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -592,7 +592,7 @@ Variables}), or null input bytes when the
 Options}).
 
 By default, @var{type} is @samp{binary}, and @command{grep}
-suppresses output afer null input binary data is discovered,
+suppresses output after null input binary data is discovered,
 and suppresses output lines that contain improperly encoded data.
 When some output is suppressed, @command{grep} follows any output
 with a one-line message saying that a binary file matches.

-----------------------------------------------------------------------

Summary of changes:
 doc/grep.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Tue Jun 27 09:51:37 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1dPqu1-0001Eg-B2
	for mharc-grep-commit@gnu.org; Tue, 27 Jun 2017 09:51:37 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36870)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1dPqtz-0001Ea-Dq
	for grep-commit@gnu.org; Tue, 27 Jun 2017 09:51:36 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1dPqty-00039d-He
	for grep-commit@gnu.org; Tue, 27 Jun 2017 09:51:35 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:49981)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1dPqty-00038Q-EL
	for grep-commit@gnu.org; Tue, 27 Jun 2017 09:51:34 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 69698)
	id 965F920EC0; Tue, 27 Jun 2017 09:51:33 -0400 (EDT)
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v3.0-25-gbdce7a2
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1a725c23dff1f1d3f1d5935837ef01eeeb147bc4
X-Git-Newrev: bdce7a23e55e82efa429e001dd6f2979d7f5d351
Message-Id: <20170627135133.965F920EC0@vcs0.savannah.gnu.org>
Date: Tue, 27 Jun 2017 09:51:33 -0400 (EDT)
From: jim@meyering.net (Jim Meyering)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit/>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jun 2017 13:51:36 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  bdce7a23e55e82efa429e001dd6f2979d7f5d351 (commit)
      from  1a725c23dff1f1d3f1d5935837ef01eeeb147bc4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=bdce7a23e55e82efa429e001dd6f2979d7f5d351


commit bdce7a23e55e82efa429e001dd6f2979d7f5d351
Author: Jim Meyering <meyering@fb.com>
Date:   Sun Jun 25 16:19:37 2017 -0700

    gnulib: update to latest
    
    * gnulib: Update to latest for these portability fixes:
    - stat: port to xlc 12.01
    - xalloc-oversized: port to icc

diff --git a/gnulib b/gnulib
index 40f8a19..9ae75d1 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 40f8a19bcbc34c91d7be1806760ac0e530285f46
+Subproject commit 9ae75d1450362acb61bfa1f0f77905b76f894838

-----------------------------------------------------------------------

Summary of changes:
 gnulib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
grep


