* regex.c (regex_compile): Setup gl_state as well.

2 files changed, 9 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c6bb157aea7..f7226d6fc6f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2010-03-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * regex.c (regex_compile): Setup gl_state as well.
+
         * syntax.c (skip_chars): Setup gl_state (bug#3823).
         (in_classes): Use CONSP before XCAR/XCDR.
 
diff --git a/src/regex.c b/src/regex.c
index bb921a5b519..f242446796d 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -3065,6 +3065,13 @@ regex_compile (pattern, size, syntax, bufp)
                            don't need to handle them for multibyte.
                            They are distinguished by a negative wctype.  */
 
+                        /* Setup the gl_state object to its buffer-defined
+                           value.  This hardcodes the buffer-global
+                           syntax-table for ASCII chars, while the other chars
+                           will obey syntax-table properties.  It's not ideal,
+                           but it's the way it's been done until now.  */
+                        SETUP_SYNTAX_TABLE (BEGV, 0);
+
                         for (ch = 0; ch < 256; ++ch)
                           {
                             c = RE_CHAR_TO_MULTIBYTE (ch);