# HG changeset patch
# User Jim Meyering <meyering@redhat.com>
# Date 1263889431 -3600
# Node ID 00cfc5186819f01b7202dd6558d45dd14defbe87
# Parent  b8269a183e3efdf8b798d593b9179befe843b451
regcomp.c: spelling and merge-artifact from glibc

* lib/regcomp.c: Merge remainder of glibc's
2da42bc06566bc89785e580fa1ac89b4c9f2a63c.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-01-28  Jim Meyering  <meyering@redhat.com>
 
+	regcomp.c: spelling and merge-artifact from glibc
+	* lib/regcomp.c: Merge remainder of glibc's
+	2da42bc06566bc89785e580fa1ac89b4c9f2a63c.
+
 	regcomp.c: sync white-space changes from glibc
 	* lib/regcomp.c: Merge to accommodate white space
 	changes from glibc's 2da42bc06566bc89785e580fa1ac89b4c9f2a63c.
diff --git a/lib/regcomp.c b/lib/regcomp.c
--- a/lib/regcomp.c
+++ b/lib/regcomp.c
@@ -1682,10 +1682,9 @@
 {
   reg_errcode_t err;
   Idx i;
-  bool incomplete;
+  re_node_set eclosure;
   bool ok;
-  re_node_set eclosure;
-  incomplete = false;
+  bool incomplete = false;
   err = re_node_set_alloc (&eclosure, dfa->edests[node].nelem + 1);
   if (BE (err != REG_NOERROR, 0))
     return err;
@@ -1742,7 +1741,7 @@
 	  }
       }
 
-  /* Epsilon closures include itself.  */
+  /* An epsilon closure includes itself.  */
   ok = re_node_set_insert (&eclosure, node);
   if (BE (! ok, 0))
     return REG_ESPACE;