grep branch, master, updated. v2.27-43-g8486cc9

[Jim Meyering]

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  8486cc9546c61eeb0decf65eca788e550254a93e (commit)
      from  f20a648c6c24a4015cf801f5b11a78b2182ed171 (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=8486cc9546c61eeb0decf65eca788e550254a93e


commit 8486cc9546c61eeb0decf65eca788e550254a93e
Author: Jim Meyering <address@hidden>
Date:   Tue Jan 17 09:07:15 2017 -0800

    maint: avoid new syntax-check failures
    
    * src/kwset.c (struct kwset): Split a line longer than 80.
    * bootstrap: Update from gnulib. This fixes a new syntax-check
    failure due to its use of "time stamp".

diff --git a/bootstrap b/bootstrap
index 715c7ad..932ff85 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2014-12-08.12; # UTC
+scriptversion=2017-01-09.19; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -42,7 +42,7 @@ export LC_ALL
 
 local_gl_dir=gl
 
-# Honour $PERL, but work even if there is none
+# Honor $PERL, but work even if there is none.
 PERL="${PERL-perl}"
 
 me=$0
@@ -418,28 +418,30 @@ sort_ver() { # sort -V is not generally available
   done
 }
 
-get_version() {
-  app=$1
+get_version_sed='
+# Move version to start of line.
+s/.*[v ]\([0-9]\)/\1/
 
-  $app --version >/dev/null 2>&1 || { $app --version; return 1; }
+# Skip lines that do not start with version.
+/^[0-9]/!d
 
-  $app --version 2>&1 |
-  sed -n '# Move version to start of line.
-          s/.*[v ]\([0-9]\)/\1/
+# Remove characters after the version.
+s/[^.a-z0-9-].*//
 
-          # Skip lines that do not start with version.
-          /^[0-9]/!d
+# The first component must be digits only.
+s/^\([0-9]*\)[a-z-].*/\1/
 
-          # Remove characters after the version.
-          s/[^.a-z0-9-].*//
+#the following essentially does s/5.005/5.5/
+s/\.0*\([1-9]\)/.\1/g
+p
+q'
 
-          # The first component must be digits only.
-          s/^\([0-9]*\)[a-z-].*/\1/
+get_version() {
+  app=$1
+
+  $app --version >/dev/null 2>&1 || { $app --version; return 1; }
 
-          #the following essentially does s/5.005/5.5/
-          s/\.0*\([1-9]\)/.\1/g
-          p
-          q'
+  $app --version 2>&1 | sed -n "$get_version_sed"
 }
 
 check_versions() {
@@ -788,7 +790,7 @@ symlink_to_dir()
       # Leave any existing symlink alone, if it already points to the source,
       # so that broken build tools that care about symlink times
       # aren't confused into doing unnecessary builds.  Conversely, if the
-      # existing symlink's time stamp is older than the source, make it afresh,
+      # existing symlink's timestamp is older than the source, make it afresh,
       # so that broken tools aren't confused into skipping needed builds.  See
       # <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00326.html>.
       test -h "$dst" &&
@@ -1021,6 +1023,6 @@ echo "$0: done.  Now you can run './configure'."
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/src/kwset.c b/src/kwset.c
index bbb837c..0c0993d 100644
--- a/src/kwset.c
+++ b/src/kwset.c
@@ -101,7 +101,8 @@ struct kwset
   unsigned char delta[NCHAR];  /* Delta table for rapid search.  */
   struct trie *next[NCHAR];    /* Table of children of the root.  */
   char *target;                        /* Target string if there's only one.  
*/
-  ptrdiff_t *shift;            /* Used in Boyer-Moore search for one string.  
*/
+  ptrdiff_t *shift;            /* Used in Boyer-Moore search for one
+                                   string.  */
   char const *trans;           /* Character translation table.  */
 
   /* If there's only one string, this is the string's last byte,

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

Summary of changes:
 bootstrap   |   42 ++++++++++++++++++++++--------------------
 src/kwset.c |    3 ++-
 2 files changed, 24 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
grep