grep branch, master, updated. v2.21-38-g4feddde

[Paul Eggert]

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  4fedddefdf373d4335223a4a589d86bccdeca65b (commit)
       via  14f8e489e3708f5592bdc0fea3a876302d93d4db (commit)
      from  cd85f6ad171e784a6177e590b24be41e05a6b605 (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=4fedddefdf373d4335223a4a589d86bccdeca65b


commit 4fedddefdf373d4335223a4a589d86bccdeca65b
Author: Paul Eggert <address@hidden>
Date:   Fri Jul 3 08:11:53 2015 -0700

    grep: simplify print_line_middle slightly
    
    * src/grep.c (print_line_middle): Simplify.

diff --git a/src/grep.c b/src/grep.c
index d1581e3..778dbcb 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -1022,8 +1022,8 @@ print_line_middle (const char *beg, const char *lim,
   const char *mid = NULL;
 
   while (cur < lim
-         && ((match_offset = execute (beg, lim - beg, &match_size,
-                                      beg + (cur - beg))) != (size_t) -1))
+         && ((match_offset = execute (beg, lim - beg, &match_size, cur))
+             != (size_t) -1))
     {
       char const *b = beg + match_offset;
 

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=14f8e489e3708f5592bdc0fea3a876302d93d4db


commit 4fedddefdf373d4335223a4a589d86bccdeca65b
Author: Paul Eggert <address@hidden>
Date:   Fri Jul 3 08:11:53 2015 -0700

    grep: simplify print_line_middle slightly
    
    * src/grep.c (print_line_middle): Simplify.

diff --git a/src/grep.c b/src/grep.c
index d1581e3..778dbcb 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -1022,8 +1022,8 @@ print_line_middle (const char *beg, const char *lim,
   const char *mid = NULL;
 
   while (cur < lim
-         && ((match_offset = execute (beg, lim - beg, &match_size,
-                                      beg + (cur - beg))) != (size_t) -1))
+         && ((match_offset = execute (beg, lim - beg, &match_size, cur))
+             != (size_t) -1))
     {
       char const *b = beg + match_offset;
 

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

Summary of changes:
 src/grep.c         |    4 +-
 src/pcresearch.c   |   55 ++++++++++++++++++++++++++++++++-------------------
 tests/Makefile.am  |    1 +
 tests/pcre-context |   38 +++++++++++++++++++++++++++++++++++
 4 files changed, 75 insertions(+), 23 deletions(-)
 create mode 100755 tests/pcre-context


hooks/post-receive
-- 
grep