* 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 e11c5d1c341f881f1ec22dad6a7588a3c8571cfa..f00fb3c9dd3dab270d7fa8925b866100e7b662eb 100644 (file)
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -27,6 +27,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 Lisp_Object Qsyntax_table_p;
 
+static void scan_sexps_forward ();
+static int char_quoted ();
+
 int words_include_escapes;
 
 /* This is the internal form of the parse state used in parse-partial-sexp.  */
@@ -227,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\
@@ -260,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, 
@@ -328,6 +331,7 @@ DEFUN ("modify-syntax-entry", Fmodify_syntax_entry, Smodify_syntax_entry, 2, 3,
 \f
 /* Dump syntax table to buffer in human-readable format */
 
+static void
 describe_syntax (value)
     Lisp_Object value;
 {
@@ -444,7 +448,7 @@ describe_syntax (value)
   insert_string ("\n");
 }
 
-Lisp_Object
+static Lisp_Object
 describe_syntax_1 (vector)
      Lisp_Object vector;
 {
@@ -680,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.  */
@@ -705,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.
@@ -805,7 +811,7 @@ between them, return t; otherwise return nil.")
                       last passed a comment starter.  */
                    struct lisp_parse_state state;
                    scan_sexps_forward (&state, find_defun_start (comment_end),
-                                       comment_end - 1, -10000, 0, Qnil, 1);
+                                       comment_end - 1, -10000, 0, Qnil, 0);
                    if (state.incomment)
                      from = state.comstart;
                    else
@@ -1072,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.  */
@@ -1092,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.
@@ -1192,7 +1200,7 @@ scan_lists (from, count, depth, sexpflag)
                       last passed a comment starter.  */
                    struct lisp_parse_state state;
                    scan_sexps_forward (&state, find_defun_start (comment_end),
-                                       comment_end - 1, -10000, 0, Qnil, 1);
+                                       comment_end - 1, -10000, 0, Qnil, 0);
                    if (state.incomment)
                      from = state.comstart;
                    else
@@ -1238,6 +1246,7 @@ scan_lists (from, count, depth, sexpflag)
   /* NOTREACHED */
 }
 
+static int
 char_quoted (pos)
      register int pos;
 {
@@ -1321,6 +1330,7 @@ This includes chars with \"quote\" or \"prefix\" syntax (' or p).")
    If STOPBEFORE is nonzero, stop at the start of an atom.
    If COMMENTSTOP is nonzero, stop at the start of a comment.  */
 
+static void
 scan_sexps_forward (stateptr, from, end, targetdepth,
                    stopbefore, oldstate, commentstop)
      struct lisp_parse_state *stateptr;
@@ -1404,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++;
        }
 
@@ -1465,7 +1479,6 @@ scan_sexps_forward (stateptr, from, end, targetdepth,
 
        case Scomment:
          state.incomment = 1;
-         state.comstart = from;
        startincomment:
          if (commentstop)
            goto done;