(Fbyte_code): Use BEFORE_POTENTIAL_GC and

[gnu-emacs] / src / syntax.c

diff --git a/src/syntax.c b/src/syntax.c
index d1830462726c7ba4c1cd4bdf4746449a4bb552b8..60501f9677f32ffba637cdd0e9c4923a8e0fcdb7 100644 (file)
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1,5 +1,5 @@
 /* GNU Emacs routines to deal with syntax tables; also word and list parsing.
-   Copyright (C) 1985, 87, 93, 94, 95, 97, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1985, 87, 93, 94, 95, 97, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -120,7 +120,7 @@ update_syntax_table (charpos, count, init, object)
      Lisp_Object object;
 {
   Lisp_Object tmp_table;
-  int cnt = 0, doing_extra = 0, invalidate = 1;
+  int cnt = 0, invalidate = 1;
   INTERVAL i, oldi;
 
   if (init)
@@ -345,8 +345,6 @@ static int
 find_defun_start (pos, pos_byte)
      int pos, pos_byte;
 {
-  int tem;
-  int shortage;
   int opoint = PT, opoint_byte = PT_BYTE;
 
   /* Use previous finding, if it's valid and applies to this inquiry.  */
@@ -480,7 +478,7 @@ back_comment (from, from_byte, stop, comnested, comstyle, charpos_ptr, bytepos_p
      that determines quote parity to the comment-end.  */
   while (from != stop)
     {
-      int temp_byte, prev_comend_second;
+      int temp_byte;
 
       /* Move back and examine a character.  */
       DEC_BOTH (from, from_byte);
@@ -565,10 +563,12 @@ back_comment (from, from_byte, stop, comnested, comstyle, charpos_ptr, bytepos_p
         (because they go with the earlier comment-ender).  */
       if (code == Sendcomment
          && SYNTAX_COMMENT_STYLE (FETCH_CHAR (from_byte)) == comstyle)
-       if (comnested)
-         nesting++;
-       else
-         break;
+       {
+         if (comnested)
+           nesting++;
+         else
+           break;
+       }
 
       /* Assume a defun-start point is outside of strings.  */
       if (code == Sopen
@@ -955,7 +955,7 @@ describe_syntax (value)
     Lisp_Object value;
 {
   register enum syntaxcode code;
-  char desc, match, start1, start2, end1, end2, prefix, comstyle;
+  char desc, start1, start2, end1, end2, prefix, comstyle;
   char str[2];
   Lisp_Object first, match_lisp;
 
@@ -979,8 +979,8 @@ describe_syntax (value)
       return;
     }
 
-  first = XCONS (value)->car;
-  match_lisp = XCONS (value)->cdr;
+  first = XCAR (value);
+  match_lisp = XCDR (value);
 
   if (!INTEGERP (first) || !(NILP (match_lisp) || INTEGERP (match_lisp)))
     {
@@ -1236,15 +1236,10 @@ and nil is returned.")
       return Qnil;
     }
 
-  /* If in a mini-buffer and moving backwards, stop at the end of the
-     prompt.  This prevents accidentially moving into the read-only
-     prompt.  */
-  if (INTEGERP (current_buffer->prompt_end_charpos)
-      && (prompt_end = XINT (current_buffer->prompt_end_charpos),
-         ((PT > prompt_end && val < prompt_end)
-          || (PT < prompt_end && val > prompt_end))))
-    val = prompt_end;
-    
+  /* Avoid jumping out of an input field.  */
+  val = XFASTINT (Fconstrain_to_field (make_number (val), make_number (PT),
+                                      Qt, Qnil));
+
   SET_PT (val);
   return Qt;
 }
@@ -1304,7 +1299,6 @@ skip_chars (forwardp, syntaxp, string, lim)
      int forwardp, syntaxp;
      Lisp_Object string, lim;
 {
-  register unsigned char *p, *pend;
   register unsigned int c;
   register int ch;
   unsigned char fastmap[0400];
@@ -1705,16 +1699,18 @@ forw_comment (from, from_byte, stop, nesting, style, prev_syntax,
          && SYNTAX_FLAGS_COMMENT_STYLE (syntax) == style
          && (c1 = FETCH_CHAR (from_byte),
              SYNTAX_COMEND_SECOND (c1)))
-       if (--nesting <= 0)
-         /* we have encountered a comment end of the same style
-            as the comment sequence which began this comment
-            section */
-         break;
-       else
-         {
-           INC_BOTH (from, from_byte);
-           UPDATE_SYNTAX_TABLE_FORWARD (from);
-         }
+       {
+         if (--nesting <= 0)
+           /* we have encountered a comment end of the same style
+              as the comment sequence which began this comment
+              section */
+           break;
+         else
+           {
+             INC_BOTH (from, from_byte);
+             UPDATE_SYNTAX_TABLE_FORWARD (from);
+           }
+       }
       if (nesting > 0
          && from < stop
          && SYNTAX_FLAGS_COMSTART_FIRST (syntax)
@@ -2462,14 +2458,14 @@ do { prev_from = from;                          \
       oldstate = Fcdr (oldstate);
       tem = Fcar (oldstate);
       /* Check whether we are inside string_fence-style string: */
-      state.instring = ( !NILP (tem) 
-                        ? ( INTEGERP (tem) ? XINT (tem) : ST_STRING_STYLE) 
-                        : -1);
+      state.instring = (!NILP (tem) 
+                       ? (INTEGERP (tem) ? XINT (tem) : ST_STRING_STYLE) 
+                       : -1);
 
       oldstate = Fcdr (oldstate);
       tem = Fcar (oldstate);
-      state.incomment = ( !NILP (tem)
-                        ? ( INTEGERP (tem) ? XINT (tem) : -1)
+      state.incomment = (!NILP (tem)
+                        ? (INTEGERP (tem) ? XINT (tem) : -1)
                         : 0);
 
       oldstate = Fcdr (oldstate);
@@ -2481,8 +2477,8 @@ do { prev_from = from;                            \
       oldstate = Fcdr (oldstate);
       oldstate = Fcdr (oldstate);
       tem = Fcar (oldstate);
-      state.comstyle = NILP (tem) ? 0 : ( EQ (tem, Qsyntax_table) 
-                                         ? ST_COMMENT_STYLE : 1 );
+      state.comstyle = NILP (tem) ? 0 : (EQ (tem, Qsyntax_table) 
+                                        ? ST_COMMENT_STYLE : 1);
 
       oldstate = Fcdr (oldstate);
       tem = Fcar (oldstate);