Merge branch 'master' into feature/fix-comments

2 files changed, 2 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 765d6c4c..887d5475 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,7 @@
 
 	Unrelated:
 
-	* dfa.c: Sync with GNULIB.
+	* dfa.c: Sync with GNULIB. Twice in one day.
 
 	Unrelated: Start improving profiling comments for switch/case.
 
diff --git a/dfa.c b/dfa.c
index f3939189..b735445f 100644
--- a/dfa.c
+++ b/dfa.c
@@ -2939,7 +2939,7 @@ transit_state (struct dfa *d, state_num s, unsigned char const **pp,
   /* Calculate the state which can be reached from the state 's' by
      consuming 'mbclen' single bytes from the buffer.  */
   s1 = s;
-  for (i = 0; i < mbclen && 0 <= s; i++)
+  for (i = 0; i < mbclen && (i == 0 || d->min_trcount <= s); i++)
     s = transit_state_singlebyte (d, s, pp);
   *pp += mbclen - i;
 
@@ -3298,12 +3298,6 @@ free_mbdata (struct dfa *d)
 static bool _GL_ATTRIBUTE_PURE
 dfa_supported (struct dfa const *d)
 {
-  /* Declare any non-UTF8 multibyte locale "not supported."  Otherwise, a
-     regexp like ".*7" would mistakenly match \uC9, e.g., via this command:
-     (export LC_ALL=zh_CN.gb18030; printf '\uC9\n' | grep '.*7')  */
-  if (d->localeinfo.multibyte && !d->localeinfo.using_utf8)
-    return false;
-
   size_t i;
   for (i = 0; i < d->tindex; i++)
     {