(HAVE_RANDOM, HAVE_XSCREENNUMBEROFSCREEN, BROKEN_FIONREAD): Add definitions.

[gnu-emacs] / src / syntax.c

diff --git a/src/syntax.c b/src/syntax.c
index 67a14f8923c5553c037fd4ce83567b95dd19fc0b..50a7c9c250d448e8bc2f32af1a5e00b8097cd93a 100644 (file)
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -18,7 +18,7 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 
-#include "config.h"
+#include <config.h>
 #include <ctype.h>
 #include "lisp.h"
 #include "commands.h"
@@ -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, 
@@ -605,11 +605,11 @@ between them, return t; otherwise return nil.")
          if (from < stop && SYNTAX_COMSTART_FIRST (c)
              && SYNTAX_COMSTART_SECOND (FETCH_CHAR (from)))
            {
-             /* we have encountered a comment start sequence and we 
-                are ignoring all text inside comments. we must record
+             /* We have encountered a comment start sequence and we 
+                are ignoring all text inside comments.  We must record
                 the comment style this sequence begins so that later,
                 only a comment end of the same style actually ends
-                the comment section */
+                the comment section.  */
              code = Scomment;
              comstyle = SYNTAX_COMMENT_STYLE (FETCH_CHAR (from));
              from++;
@@ -670,13 +670,15 @@ between them, return t; otherwise return nil.")
          c = FETCH_CHAR (from);
          code = SYNTAX (c);
          comstyle = 0;
+         if (code == Sendcomment)
+           comstyle = SYNTAX_COMMENT_STYLE (c);
          if (from > stop && SYNTAX_COMEND_SECOND (c)
              && SYNTAX_COMEND_FIRST (FETCH_CHAR (from - 1))
              && !char_quoted (from - 1))
            {
-             /* we must record the comment style encountered so that
+             /* We must record the comment style encountered so that
                 later, we can match only the proper comment begin
-                sequence of the same style */
+                sequence of the same style.  */
              code = Sendcomment;
              comstyle = SYNTAX_COMMENT_STYLE (FETCH_CHAR (from - 1));
              from--;
@@ -819,6 +821,8 @@ between them, return t; otherwise return nil.")
                      from = comment_end;
                  }
              }
+             /* We have skipped one comment.  */
+             break;
            }
          else if ((code != Swhitespace && code != Scomment) || quoted)
            {
@@ -1013,6 +1017,9 @@ scan_lists (from, count, depth, sexpflag)
            from--;
          c = FETCH_CHAR (from);
          code = SYNTAX (c);
+         comstyle = 0;
+         if (code == Sendcomment)
+           comstyle = SYNTAX_COMMENT_STYLE (c);
          if (from > stop && SYNTAX_COMEND_SECOND (c)
              && SYNTAX_COMEND_FIRST (FETCH_CHAR (from - 1))
              && !char_quoted (from - 1)
@@ -1390,7 +1397,6 @@ scan_sexps_forward (stateptr, from, end, targetdepth,
         style a. if it is non-nil, we are in comment style b */
       oldstate = Fcdr (oldstate);
       oldstate = Fcdr (oldstate);
-      oldstate = Fcdr (oldstate);
       tem = Fcar (oldstate);
       state.comstyle = !NILP (tem);
     }
@@ -1590,20 +1596,20 @@ Parsing stops at TO or when certain criteria are met;\n\
 If fifth arg STATE is omitted or nil,\n\
  parsing assumes that FROM is the beginning of a function.\n\
 Value is a list of eight elements describing final state of parsing:\n\
- 1. depth in parens.\n\
- 2. character address of start of innermost containing list; nil if none.\n\
- 3. character address of start of last complete sexp terminated.\n\
- 4. non-nil if inside a string.\n\
+ 0. depth in parens.\n\
+ 1. character address of start of innermost containing list; nil if none.\n\
+ 2. character address of start of last complete sexp terminated.\n\
+ 3. non-nil if inside a string.\n\
     (it is the character that will terminate the string.)\n\
- 5. t if inside a comment.\n\
- 6. t if following a quote character.\n\
- 7. the minimum paren-depth encountered during this scan.\n\
- 8. t if in a comment of style `b'.\n\
+ 4. t if inside a comment.\n\
+ 5. t if following a quote character.\n\
+ 6. the minimum paren-depth encountered during this scan.\n\
+ 7. t if in a comment of style `b'.\n\
 If third arg TARGETDEPTH is non-nil, parsing stops if the depth\n\
 in parentheses becomes equal to TARGETDEPTH.\n\
 Fourth arg STOPBEFORE non-nil means stop when come to\n\
  any character that starts a sexp.\n\
-Fifth arg STATE is a seven-list like what this function returns.\n\
+Fifth arg STATE is an eight-list like what this function returns.\n\
 It is used to initialize the state of the parse.  Its second and third
 elements are ignored.
 Sixth args COMMENTSTOP non-nil means stop at the start of a comment.")