From MAILER-DAEMON Tue Feb 01 15:56:12 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1PkNGm-00020y-L1
	for mharc-m4-commit@gnu.org; Tue, 01 Feb 2011 15:56:12 -0500
Received: from [140.186.70.92] (port=47869 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PkNGk-0001zX-6j
	for m4-commit@gnu.org; Tue, 01 Feb 2011 15:56:12 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PkNGh-00077E-BS
	for m4-commit@gnu.org; Tue, 01 Feb 2011 15:56:08 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:59577
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PkNGh-00077A-8P
	for m4-commit@gnu.org; Tue, 01 Feb 2011 15:56:07 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PkNGg-0003q4-Qi
	for m4-commit@gnu.org; Tue, 01 Feb 2011 20:56:06 +0000
Received: from ericb by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PkNGg-0004pd-6Z
	for m4-commit@gnu.org; Tue, 01 Feb 2011 20:56:06 +0000
From: "Eric Blake" <eblake@redhat.com>
To: m4-commit@gnu.org
X-Git-Refname: refs/heads/branch-1.4
X-Git-Reftype: branch
X-Git-Oldrev: 5ac6004900880cf7613cb13608d84e92b987905f
X-Git-Newrev: ded10d6eab7aeccbba58b9a298c9218971b20201
Message-Id: <E1PkNGg-0004pd-6Z@vcs-noshell.in.savannah.gnu.org>
Date: Tue, 01 Feb 2011 20:56:06 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
Subject: [SCM] GNU M4 source repository branch, branch-1.4,
	updated. v1.4.15-10-gded10d6
X-BeenThere: m4-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: m4-patches@gnu.org
List-Id: git commit notices for  GNU m4 <m4-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/m4-commit>,
	<mailto:m4-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/m4-commit>
List-Post: <mailto:m4-commit@gnu.org>
List-Help: <mailto:m4-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/m4-commit>,
	<mailto:m4-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Feb 2011 20:56:12 -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 "GNU M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=ded10d6eab7aeccbba58b9a298c9218971b20201

The branch, branch-1.4 has been updated
       via  ded10d6eab7aeccbba58b9a298c9218971b20201 (commit)
       via  5fe6f01e64e376c59745993a9f6d920922303868 (commit)
      from  5ac6004900880cf7613cb13608d84e92b987905f (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 -----------------------------------------------------------------
commit ded10d6eab7aeccbba58b9a298c9218971b20201
Author: Eric Blake <eblake@redhat.com>
Date:   Tue Feb 1 13:48:12 2011 -0700

    maint: update to latest gnulib
    
    * gnulib: Update to latest.
    * m4/gnulib-cache.m4: Regenerate.
    * src/builtin.c (m4_ifelse): Use STREQ.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>

commit 5fe6f01e64e376c59745993a9f6d920922303868
Author: Eric Blake <eblake@redhat.com>
Date:   Tue Jan 25 19:33:53 2011 -0700

    maint: reflect recent copyright assignments
    
    * AUTHORS: Update.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>

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

Summary of changes:
 AUTHORS            |    2 +-
 ChangeLog          |   12 ++++++++++++
 gnulib             |    2 +-
 m4/gnulib-cache.m4 |    2 +-
 src/builtin.c      |    2 +-
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 7ed23d5..667db4c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -28,7 +28,7 @@ Markus Duft                 markus.duft@salomon.at        2006-08-03
 Joel E. Denny               jdenny@clemson.edu            2009-08-18
 David Warme                 David.Warme@Group-W-Inc.com   2010-03-10
 Raphael Poss                m4-patches@raphael.poss.name  2010-10-04
-
+Tim Rice                    tim@multitalents.net          2011-01-24
 
 ========================================================================
 
diff --git a/ChangeLog b/ChangeLog
index 2d2d0c1..71ec8ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-02-01  Eric Blake  <eblake@redhat.com>
+
+	maint: update to latest gnulib
+	* gnulib: Update to latest.
+	* m4/gnulib-cache.m4: Regenerate.
+	* src/builtin.c (m4_ifelse): Use STREQ.
+
+2011-01-25  Eric Blake  <eblake@redhat.com>
+
+	maint: reflect recent copyright assignments
+	* AUTHORS: Update.
+
 2011-01-03  Eric Blake  <eblake@redhat.com>
 
 	maint: update copyright year
diff --git a/gnulib b/gnulib
index a2e8447..a036b76 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit a2e8447d6b8abe23504f4f2d4757a60a2e8bee54
+Subproject commit a036b7684f9671ee53999773785d1865603c3849
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 6ddefc5..552a393 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2010 Free Software Foundation, Inc.
+# Copyright (C) 2002-2011 Free Software Foundation, Inc.
 #
 # This file is free software, distributed under the terms of the GNU
 # General Public License.  As a special exception to the GNU General
diff --git a/src/builtin.c b/src/builtin.c
index 3787e70..8ff03e8 100644
--- a/src/builtin.c
+++ b/src/builtin.c
@@ -661,7 +661,7 @@ m4_ifelse (struct obstack *obs, int argc, token_data **argv)
   result = NULL;
   while (result == NULL)
 
-    if (strcmp (ARG (0), ARG (1)) == 0)
+    if (STREQ (ARG (0), ARG (1)))
       result = ARG (2);
 
     else


hooks/post-receive
-- 
GNU M4 source repository


From MAILER-DAEMON Mon Feb 07 17:57:03 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Pma10-00051N-Up
	for mharc-m4-commit@gnu.org; Mon, 07 Feb 2011 17:57:03 -0500
Received: from [140.186.70.92] (port=39094 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PmYOV-00085x-8k
	for m4-commit@gnu.org; Mon, 07 Feb 2011 16:13:15 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PmVL3-0004xl-9t
	for m4-commit@gnu.org; Mon, 07 Feb 2011 12:57:26 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:45932
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PmVL3-0004xh-6o
	for m4-commit@gnu.org; Mon, 07 Feb 2011 12:57:25 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PmVL2-0008Nj-LP
	for m4-commit@gnu.org; Mon, 07 Feb 2011 17:57:24 +0000
Received: from ericb by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PmVL2-0005sB-G8
	for m4-commit@gnu.org; Mon, 07 Feb 2011 17:57:24 +0000
From: "Eric Blake" <eblake@redhat.com>
To: m4-commit@gnu.org
X-Git-Refname: refs/heads/branch-1.4
X-Git-Reftype: branch
X-Git-Oldrev: ded10d6eab7aeccbba58b9a298c9218971b20201
X-Git-Newrev: 54851f6027d54b191b03b9bd755993dc3b09bb4a
Message-Id: <E1PmVL2-0005sB-G8@vcs-noshell.in.savannah.gnu.org>
Date: Mon, 07 Feb 2011 17:57:24 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
Subject: [SCM] GNU M4 source repository branch, branch-1.4,
	updated. v1.4.15-12-g54851f6
X-BeenThere: m4-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: m4-patches@gnu.org
List-Id: git commit notices for  GNU m4 <m4-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/m4-commit>,
	<mailto:m4-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/m4-commit>
List-Post: <mailto:m4-commit@gnu.org>
List-Help: <mailto:m4-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/m4-commit>,
	<mailto:m4-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Feb 2011 22:57:00 -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 "GNU M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=54851f6027d54b191b03b9bd755993dc3b09bb4a

The branch, branch-1.4 has been updated
       via  54851f6027d54b191b03b9bd755993dc3b09bb4a (commit)
       via  b2a3f07148544250e55717905c7b46a09e92d700 (commit)
      from  ded10d6eab7aeccbba58b9a298c9218971b20201 (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 -----------------------------------------------------------------
commit 54851f6027d54b191b03b9bd755993dc3b09bb4a
Author: Eric Blake <eblake@redhat.com>
Date:   Sat Feb 5 15:55:17 2011 -0700

    maint: speed up configure, using latest gnulib
    
    * gnulib: Update to latest.
    * m4/gnulib-cache.m4: Import fclose and rename modules.
    * configure.ac (gl_ASSERT_NO_GNULIB_POSIXCHECK): Speed up normal
    configure runs (and document how to rerun GNULIB_POSIXCHECK).
    * HACKING: Document GNULIB_POSIXCHECK.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>

commit b2a3f07148544250e55717905c7b46a09e92d700
Author: Eric Blake <eblake@redhat.com>
Date:   Mon Feb 7 09:48:11 2011 -0700

    maint: update http git cloning instructions
    
    * HACKING: Git http doesn't like the redirect at git.sv.gnu.org.
    * THANKS: Update.
    Reported by Mike Dupont.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>

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

Summary of changes:
 ChangeLog          |   14 ++++++++++++++
 HACKING            |    7 ++++++-
 THANKS             |    1 +
 configure.ac       |    5 +++++
 gnulib             |    2 +-
 m4/gnulib-cache.m4 |    4 +++-
 6 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 71ec8ae..9f3c5a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2011-02-07  Eric Blake  <eblake@redhat.com>
+
+	maint: speed up configure, using latest gnulib
+	* gnulib: Update to latest.
+	* m4/gnulib-cache.m4: Import fclose and rename modules.
+	* configure.ac (gl_ASSERT_NO_GNULIB_POSIXCHECK): Speed up normal
+	configure runs (and document how to rerun GNULIB_POSIXCHECK).
+	* HACKING: Document GNULIB_POSIXCHECK.
+
+	maint: update http git cloning instructions
+	* HACKING: Git http doesn't like the redirect at git.sv.gnu.org.
+	* THANKS: Update.
+	Reported by Mike Dupont.
+
 2011-02-01  Eric Blake  <eblake@redhat.com>
 
 	maint: update to latest gnulib
diff --git a/HACKING b/HACKING
index 081f8b0..6e4552d 100644
--- a/HACKING
+++ b/HACKING
@@ -91,7 +91,7 @@ and is not part of a release distribution.
 
   If you are behind a firewall that blocks the git protocol, you may
   find it useful to do:
-    git config --global url.http://git.sv.gnu.org/r/.insteadof \
+    git config --global url.http://git.savannah.gnu.org/r/.insteadof \
       git://git.sv.gnu.org/
   to force git to transparently rewrite all savannah git references to
   instead use http.
@@ -103,6 +103,11 @@ and is not part of a release distribution.
   from their respective upstream source, rather than the version that
   shipped with the automake release.
 
+* If you would like to check that you are not missing out on any useful
+  gnulib modules, comment out the gl_ASSERT_NO_GNULIB_POSIXCHECK in
+  configure.ac, then run 'make CFLAGS='-DGNULIB_POSIXCHECK=1' with gcc,
+  and look at the resulting warnings.
+
 
 4. Test Suite
 =============
diff --git a/THANKS b/THANKS
index 17d39bb..36e239e 100644
--- a/THANKS
+++ b/THANKS
@@ -80,6 +80,7 @@ Matthew Woehlke         mw_triad@users.sourceforge.net
 Matthias Rabe           rabe@mathematik.uni-bielefeld.de
 Michael Fetterman       mafetter@ichips.intel.com
 Michael L. Welcome      welcome@bigbird.llnl.gov
+Mike Dupont             jamesmikedupont@googlemail.com
 Mike Frysinger          vapier@gentoo.org
 Mike Lijewski           lijewski@theory.tc.cornell.edu
 Mike R.                 mroberge@aol.com
diff --git a/configure.ac b/configure.ac
index 1160c3e..17f23e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,11 @@ AC_PROG_CC
 AC_DEFUN([gl_CXX_CHOICE_DEFAULT_NO])
 M4_EARLY
 
+# Maintainer note - comment this line out if you plan to rerun
+# GNULIB_POSIXCHECK testing to see if M4 should be using more modules.
+# Leave it uncommented for normal releases, for faster ./configure.
+gl_ASSERT_NO_GNULIB_POSIXCHECK
+
 # M4 is single-threaded; so we can optimize gnulib code by using this:
 gl_DISABLE_THREADS
 
diff --git a/gnulib b/gnulib
index a036b76..6f0680e 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit a036b7684f9671ee53999773785d1865603c3849
+Subproject commit 6f0680eb29a1737d704a1df26aafc00490cd34d8
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 552a393..d7aa3bb 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -15,7 +15,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=local --lib=libm4 --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --with-tests --with-c++-tests --avoid=lock-tests --avoid=tls-tests --makefile-name=gnulib.mk --no-libtool --macro-prefix=M4 announce-gen assert autobuild avltree-oset binary-io c-stack clean-temp cloexec close-stream closein config-h dirname error execute fdl-1.3 fflush filenamecat fopen fopen-safer fseeko gendocs getopt-gnu git-version-gen gnu-web-doc-update gnumakefile gnupload gpl-3.0 ignore-value intprops maintainer-makefile manywarnings memchr2 mkstemp obstack progname regex sigaction spawn-pipe stdbool stdint stdlib-safer strsignal strstr strtod strtol unlocked-io update-copyright vc-list-files verror version-etc version-etc-fsf wait-process xalloc xoset xprintf xvasprintf-posix
+#   gnulib-tool --import --dir=. --local-dir=local --lib=libm4 --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --with-tests --with-c++-tests --avoid=lock-tests --avoid=tls-tests --makefile-name=gnulib.mk --no-libtool --macro-prefix=M4 announce-gen assert autobuild avltree-oset binary-io c-stack clean-temp cloexec close-stream closein config-h dirname error execute fclose fdl-1.3 fflush filenamecat fopen fopen-safer fseeko gendocs getopt-gnu git-version-gen gnu-web-doc-update gnumakefile gnupload gpl-3.0 ignore-value intprops maintainer-makefile manywarnings memchr2 mkstemp obstack progname regex rename sigaction spawn-pipe stdbool stdint stdlib-safer strsignal strstr strtod strtol unlocked-io update-copyright vc-list-files verror version-etc version-etc-fsf wait-process xalloc xoset xprintf xvasprintf-posix
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([local])
@@ -34,6 +34,7 @@ gl_MODULES([
   dirname
   error
   execute
+  fclose
   fdl-1.3
   fflush
   filenamecat
@@ -56,6 +57,7 @@ gl_MODULES([
   obstack
   progname
   regex
+  rename
   sigaction
   spawn-pipe
   stdbool


hooks/post-receive
-- 
GNU M4 source repository


From MAILER-DAEMON Sat Feb 26 19:12:46 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1PtUFi-0007mt-BA
	for mharc-m4-commit@gnu.org; Sat, 26 Feb 2011 19:12:46 -0500
Received: from [140.186.70.92] (port=34890 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PtUFg-0007m4-Hk
	for m4-commit@gnu.org; Sat, 26 Feb 2011 19:12:45 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PtUFf-0003fw-0w
	for m4-commit@gnu.org; Sat, 26 Feb 2011 19:12:44 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:37954
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PtUFe-0003fq-UC
	for m4-commit@gnu.org; Sat, 26 Feb 2011 19:12:42 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PtUFe-00070v-C6
	for m4-commit@gnu.org; Sun, 27 Feb 2011 00:12:42 +0000
Received: from ericb by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1PtUFd-0007VF-5e
	for m4-commit@gnu.org; Sun, 27 Feb 2011 00:12:42 +0000
From: "Eric Blake" <eblake@redhat.com>
To: m4-commit@gnu.org
X-Git-Refname: refs/heads/branch-1.4
X-Git-Reftype: branch
X-Git-Oldrev: 54851f6027d54b191b03b9bd755993dc3b09bb4a
X-Git-Newrev: 830c9d68acb3d59c465bda5934f78ca04e3fec4c
Message-Id: <E1PtUFd-0007VF-5e@vcs-noshell.in.savannah.gnu.org>
Date: Sun, 27 Feb 2011 00:12:41 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
Subject: [SCM] GNU M4 source repository branch, branch-1.4,
	updated. v1.4.15-13-g830c9d6
X-BeenThere: m4-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: m4-patches@gnu.org
List-Id: git commit notices for  GNU m4 <m4-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/m4-commit>,
	<mailto:m4-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/m4-commit>
List-Post: <mailto:m4-commit@gnu.org>
List-Help: <mailto:m4-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/m4-commit>,
	<mailto:m4-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Feb 2011 00:12: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 "GNU M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=830c9d68acb3d59c465bda5934f78ca04e3fec4c

The branch, branch-1.4 has been updated
       via  830c9d68acb3d59c465bda5934f78ca04e3fec4c (commit)
      from  54851f6027d54b191b03b9bd755993dc3b09bb4a (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 -----------------------------------------------------------------
commit 830c9d68acb3d59c465bda5934f78ca04e3fec4c
Author: Eric Blake <eblake@redhat.com>
Date:   Sat Feb 26 17:07:33 2011 -0700

    index: fix another regression from faulty strstr
    
    * gnulib: Update to latest, for strstr fix.
    * doc/m4.texinfo (Index macro): Test for the bug.
    * NEWS: Document the fix.
    * THANKS: Update.
    Reported by Mike Stump, with additional analysis from Ralf
    Wildenhues and Jim Meyering.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>

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

Summary of changes:
 ChangeLog      |   10 ++++++++++
 NEWS           |    7 ++++---
 THANKS         |    1 +
 doc/m4.texinfo |    8 ++++++++
 gnulib         |    2 +-
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9f3c5a8..cf135ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-26  Eric Blake  <eblake@redhat.com>
+
+	index: fix another regression from faulty strstr
+	* gnulib: Update to latest, for strstr fix.
+	* doc/m4.texinfo (Index macro): Test for the bug.
+	* NEWS: Document the fix.
+	* THANKS: Update.
+	Reported by Mike Stump, with additional analysis from Ralf
+	Wildenhues and Jim Meyering.
+
 2011-02-07  Eric Blake  <eblake@redhat.com>
 
 	maint: speed up configure, using latest gnulib
diff --git a/NEWS b/NEWS
index 54c58ca..d4dbb1a 100644
--- a/NEWS
+++ b/NEWS
@@ -2,9 +2,10 @@ GNU M4 NEWS - User visible changes.
 
 * Noteworthy changes in release 1.4.16 (2011-01-??) [?]
 
-** Ensure the `index' builtin cannot give false positive results.  On
-   glibc platforms, this avoids a strstr bug in glibc 2.9 through 2.12;
-   on many other platforms, it fixes a regression introduced in 1.4.11.
+** Fix regressions in the `index' builtin.  On glibc platforms, this
+   avoids false positives from a strstr bug in glibc 2.9 through 2.12;
+   on many other platforms, it fixes two separate regressions, a false
+   positive introduced in 1.4.11 and a false negative in 1.4.15.
 
 ** A number of portability improvements inherited from gnulib.
 
diff --git a/THANKS b/THANKS
index 36e239e..082e7e8 100644
--- a/THANKS
+++ b/THANKS
@@ -84,6 +84,7 @@ Mike Dupont             jamesmikedupont@googlemail.com
 Mike Frysinger          vapier@gentoo.org
 Mike Lijewski           lijewski@theory.tc.cornell.edu
 Mike R.                 mroberge@aol.com
+Mike Stump              mikestump@comcast.net
 Mikhail Teterin         Mikhail.Teterin@murex.com
 Nelson H. F. Beebe      beebe@math.utah.edu
 Nick S. Kanakakorn      skanan@otl.scu.edu
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index 1512ae1..922c649 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -5652,6 +5652,14 @@ index(`;:11-:12-:12-:12-:12-:12-:12-:12-:12.:12.:12.:12.:12.:12.:12.:12.:12-',
 `:12-:12-:12-:12-:12-:12-:12-:12-')
 @result{}-1
 @end example
+
+@comment Expose a bug in the gnulib replacement strstr() algorithm
+@comment present from Jun 2010 to Feb 2011, including m4 1.4.15.
+
+@example
+index(`..wi.d.', `.d')
+@result{}4
+@end example
 @end ignore
 
 @node Regexp
diff --git a/gnulib b/gnulib
index 6f0680e..06901ea 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 6f0680eb29a1737d704a1df26aafc00490cd34d8
+Subproject commit 06901ea287fd2d4d8f68afab41c6dbf95a854b5c


hooks/post-receive
-- 
GNU M4 source repository


From MAILER-DAEMON Mon Feb 28 09:59:25 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Pu4ZI-0006lB-RI
	for mharc-m4-commit@gnu.org; Mon, 28 Feb 2011 09:59:24 -0500
Received: from [140.186.70.92] (port=53826 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Pu4ZF-0006jj-VC
	for m4-commit@gnu.org; Mon, 28 Feb 2011 09:59:23 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Pu4Lf-0002M2-AO
	for m4-commit@gnu.org; Mon, 28 Feb 2011 09:45:20 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:59624
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Pu4Lf-0002Lw-8b
	for m4-commit@gnu.org; Mon, 28 Feb 2011 09:45:19 -0500
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Pu4Le-0008CK-SY
	for m4-commit@gnu.org; Mon, 28 Feb 2011 14:45:19 +0000
Received: from ericb by vcs-noshell.in.savannah.gnu.org with local (Exim 4.69)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Pu4Ld-00018a-SC
	for m4-commit@gnu.org; Mon, 28 Feb 2011 14:45:18 +0000
From: "Eric Blake" <eblake@redhat.com>
To: m4-commit@gnu.org
X-Git-Refname: refs/heads/branch-1.4
X-Git-Reftype: branch
X-Git-Oldrev: 830c9d68acb3d59c465bda5934f78ca04e3fec4c
X-Git-Newrev: 2e1f83075b57af0a4ceb5670a57700c94d34c09a
Message-Id: <E1Pu4Ld-00018a-SC@vcs-noshell.in.savannah.gnu.org>
Date: Mon, 28 Feb 2011 14:45:18 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
Subject: [SCM] GNU M4 source repository branch, branch-1.4,
	updated. v1.4.15-14-g2e1f830
X-BeenThere: m4-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: m4-patches@gnu.org
List-Id: git commit notices for  GNU m4 <m4-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/m4-commit>,
	<mailto:m4-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/m4-commit>
List-Post: <mailto:m4-commit@gnu.org>
List-Help: <mailto:m4-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/m4-commit>,
	<mailto:m4-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Feb 2011 14:59:24 -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 "GNU M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=2e1f83075b57af0a4ceb5670a57700c94d34c09a

The branch, branch-1.4 has been updated
       via  2e1f83075b57af0a4ceb5670a57700c94d34c09a (commit)
      from  830c9d68acb3d59c465bda5934f78ca04e3fec4c (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 -----------------------------------------------------------------
commit 2e1f83075b57af0a4ceb5670a57700c94d34c09a
Author: Eric Blake <eblake@redhat.com>
Date:   Mon Feb 28 07:43:28 2011 -0700

    index: fix typo in previous commit
    
    * doc/m4.texinfo (Index macro): Actually expose the bug.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>

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

Summary of changes:
 ChangeLog      |    5 +++++
 doc/m4.texinfo |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cf135ab..601a547 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-28  Eric Blake  <eblake@redhat.com>
+
+	index: fix typo in previous commit
+	* doc/m4.texinfo (Index macro): Actually expose the bug.
+
 2011-02-26  Eric Blake  <eblake@redhat.com>
 
 	index: fix another regression from faulty strstr
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index 922c649..1dcc8e4 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -5657,7 +5657,7 @@ index(`;:11-:12-:12-:12-:12-:12-:12-:12-:12.:12.:12.:12.:12.:12.:12.:12.:12-',
 @comment present from Jun 2010 to Feb 2011, including m4 1.4.15.
 
 @example
-index(`..wi.d.', `.d')
+index(`..wi.d.', `.d.')
 @result{}4
 @end example
 @end ignore


hooks/post-receive
-- 
GNU M4 source repository


