Merge branch 'master' into feature/typed-regex-2

2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index a6b97f79..a2e5d750 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-11-21         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* dfa.c: Sync with GNULIB.
+
 2016-11-17         Arnold D. Robbins     <arnold@skeeve.com>
 
 	General cleanup for zero termination of strings.
diff --git a/dfa.c b/dfa.c
index 62bb6435..02673781 100644
--- a/dfa.c
+++ b/dfa.c
@@ -841,8 +841,8 @@ using_simple_locale (bool multibyte)
      && '}' == 125 && '~' == 126)
   };
 
-  if (native_c_charset && !multibyte)
-    return true;
+  if (!native_c_charset || multibyte)
+    return false;
   else
     {
       /* Treat C and POSIX locales as being compatible.  Also, treat