* xterm.c (x_term_init): Adjust message printed when we can't

[gnu-emacs] / src / syntax.c

diff --git a/src/syntax.c b/src/syntax.c
index 89e5f753ba5342c156d5c9df027253b30926072b..f00fb3c9dd3dab270d7fa8925b866100e7b662eb 100644 (file)
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -230,7 +230,7 @@ are listed in the documentation of `modify-syntax-entry'.")
    for make-docfile to see.  We cannot put this in the real DEFUN
    due to limits in the Unix cpp.
 
-DEFUN ("modify-syntax-entry", foo, bar, 0, 0, 0,
+DEFUN ("modify-syntax-entry", foo, bar, 2, 3, 0,
   "Set syntax for character CHAR according to string S.\n\
 The syntax is changed only for table TABLE, which defaults to\n\
  the current buffer's syntax table.\n\
@@ -263,7 +263,7 @@ this flag:\n\
  p means C is a prefix character for `backward-prefix-chars';\n\
    such characters are treated as whitespace when they occur\n\
    between expressions.")
-
+  (char, s, table)
 */
 
 DEFUN ("modify-syntax-entry", Fmodify_syntax_entry, Smodify_syntax_entry, 2, 3, 
@@ -684,6 +684,7 @@ between them, return t; otherwise return nil.")
 
          if (code == Sendcomment && !quoted)
            {
+#if 0
              if (code != SYNTAX (c))
                /* For a two-char comment ender, we can assume
                   it does end a comment.  So scan back in a simple way.  */
@@ -709,6 +710,7 @@ between them, return t; otherwise return nil.")
                    }
                  break;
                }
+#endif /* 0 */
 
              /* Look back, counting the parity of string-quotes,
                 and recording the comment-starters seen.
@@ -1076,6 +1078,7 @@ scan_lists (from, count, depth, sexpflag)
            case Sendcomment:
              if (!parse_sexp_ignore_comments)
                break;
+#if 0
              if (code != SYNTAX (c))
                /* For a two-char comment ender, we can assume
                   it does end a comment.  So scan back in a simple way.  */
@@ -1096,6 +1099,7 @@ scan_lists (from, count, depth, sexpflag)
                    }
                  break;
                }
+#endif /* 0 */
 
              /* Look back, counting the parity of string-quotes,
                 and recording the comment-starters seen.
@@ -1410,14 +1414,18 @@ scan_sexps_forward (stateptr, from, end, targetdepth,
     {
       code = SYNTAX (FETCH_CHAR (from));
       from++;
-      if (from < end && SYNTAX_COMSTART_FIRST (FETCH_CHAR (from - 1))
-         && SYNTAX_COMSTART_SECOND (FETCH_CHAR (from)))
+      if (code == Scomment)
+       state.comstart = from-1;
+      
+      else if (from < end && SYNTAX_COMSTART_FIRST (FETCH_CHAR (from - 1))
+              && SYNTAX_COMSTART_SECOND (FETCH_CHAR (from)))
        {
          /* Record the comment style we have entered so that only
             the comment-end sequence of the same style actually
             terminates the comment section.  */
          code = Scomment;
          state.comstyle = SYNTAX_COMMENT_STYLE (FETCH_CHAR (from));
+         state.comstart = from-1;
          from++;
        }
 
@@ -1471,7 +1479,6 @@ scan_sexps_forward (stateptr, from, end, targetdepth,
 
        case Scomment:
          state.incomment = 1;
-         state.comstart = from;
        startincomment:
          if (commentstop)
            goto done;