(skip_chars): Don't examine STRING before verifying that it is a string.

(scan_lists): Use prev_char_comend_first, not ...comstart...

diff --git a/src/syntax.c b/src/syntax.c
index 79e278a5093af7b61490f66cade42d44f73d1fbc..4ab87a3a3c28b7b9e901b58a014b5f1d21fcf30d 100644 (file)
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1289,11 +1289,13 @@ skip_chars (forwardp, syntaxp, string, lim)
   int negate = 0;
   register int i, i_byte;
   int multibyte = !NILP (current_buffer->enable_multibyte_characters);
-  int string_multibyte = STRING_MULTIBYTE (string);
-  int size_byte = STRING_BYTES (XSTRING (string));
+  int string_multibyte;
+  int size_byte;
 
   CHECK_STRING (string, 0);
   char_ranges = (int *) alloca (XSTRING (string)->size * (sizeof (int)) * 2);
+  string_multibyte = STRING_MULTIBYTE (string);
+  size_byte = STRING_BYTES (XSTRING (string));
 
   if (NILP (lim))
     XSETINT (lim, forwardp ? ZV : BEGV);
@@ -2021,7 +2023,7 @@ scan_lists (from, count, depth, sexpflag)
          if (code == Sendcomment)
            comstyle = SYNTAX_COMMENT_STYLE (c);
          if (from > stop && SYNTAX_COMEND_SECOND (c)
-             && prev_char_comstart_first (from, from_byte)
+             && prev_char_comend_first (from, from_byte)
              && parse_sexp_ignore_comments)
            {
              /* We must record the comment style encountered so that