2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9e0ec429552..220a32a5022 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * syntax.c (skip_chars): Update syntax-table only after we checked that
+        the new location is valid.
+
 2007-05-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * macterm.c (x_calc_absolute_position): Add BLOCK_INPUT around
diff --git a/src/syntax.c b/src/syntax.c
index a9e6dda81fe..acb5d37825c 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1669,10 +1669,10 @@ skip_chars (forwardp, syntaxp, string, lim, handle_iso_classes)
                       p = GPT_ADDR;
                       stop = endp;
                     }
+                  UPDATE_SYNTAX_TABLE_BACKWARD (pos - 1);
                   if (! fastmap[(int) SYNTAX (p[-1])])
                     break;
                   p--, pos--;
-                  UPDATE_SYNTAX_TABLE_BACKWARD (pos - 1);
                 }
           }
       }