emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/src/syntax.c,v


From: Stefan Monnier
Subject: [Emacs-diffs] Changes to emacs/src/syntax.c,v
Date: Thu, 24 Jul 2008 20:27:57 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/07/24 20:27:57

Index: syntax.c
===================================================================
RCS file: /sources/emacs/emacs/src/syntax.c,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -b -r1.217 -r1.218
--- syntax.c    22 Jul 2008 17:09:24 -0000      1.217
+++ syntax.c    24 Jul 2008 20:27:57 -0000      1.218
@@ -70,11 +70,13 @@
     int incomment;     /* -1 if in unnestable comment else comment nesting */
     int comstyle;      /* comment style a=0, or b=1, or ST_COMMENT_STYLE.  */
     int quoted;                /* Nonzero if just after an escape char at end 
of parsing */
-    int thislevelstart;        /* Char number of most recent 
start-of-expression at current level */
-    int prevlevelstart; /* Char number of start of containing expression */
-    int location;      /* Char number at which parsing stopped.  */
     int mindepth;      /* Minimum depth seen while scanning.  */
-    int comstr_start;  /* Position just after last comment/string starter.  */
+    /* Char number of most recent start-of-expression at current level */
+    EMACS_INT thislevelstart;
+    /* Char number of start of containing expression */
+    EMACS_INT prevlevelstart;
+    EMACS_INT location;             /* Char number at which parsing stopped.  
*/
+    EMACS_INT comstr_start;  /* Position of last comment/string starter.  */
     Lisp_Object levelstarts;   /* Char numbers of starts-of-expression
                                   of levels (starting from outermost).  */
   };
@@ -95,10 +97,6 @@
 static int find_start_modiff;
 
 
-static int find_defun_start P_ ((EMACS_INT, EMACS_INT));
-static int back_comment P_ ((EMACS_INT, EMACS_INT, EMACS_INT, int, int,
-                            EMACS_INT *, EMACS_INT *));
-static int char_quoted P_ ((int, int));
 static Lisp_Object skip_chars P_ ((int, Lisp_Object, Lisp_Object, int));
 static Lisp_Object skip_syntaxes P_ ((int, Lisp_Object, Lisp_Object));
 static Lisp_Object scan_lists P_ ((EMACS_INT, EMACS_INT, EMACS_INT, int));
@@ -290,13 +288,12 @@
    or after.  On return global syntax data is good for lookup at CHARPOS. */
 
 static int
-char_quoted (charpos, bytepos)
-     register int charpos, bytepos;
+char_quoted (EMACS_INT charpos, EMACS_INT bytepos)
 {
   register enum syntaxcode code;
-  register int beg = BEGV;
+  register EMACS_INT beg = BEGV;
   register int quoted = 0;
-  int orig = charpos;
+  EMACS_INT orig = charpos;
 
   while (charpos > beg)
     {
@@ -319,9 +316,9 @@
 /* Return the bytepos one character after BYTEPOS.
    We assume that BYTEPOS is not at the end of the buffer.  */
 
-INLINE int
+INLINE EMACS_INT
 inc_bytepos (bytepos)
-     int bytepos;
+     EMACS_INT bytepos;
 {
   if (NILP (current_buffer->enable_multibyte_characters))
     return bytepos + 1;
@@ -333,9 +330,9 @@
 /* Return the bytepos one character before BYTEPOS.
    We assume that BYTEPOS is not at the start of the buffer.  */
 
-INLINE int
+INLINE EMACS_INT
 dec_bytepos (bytepos)
-     int bytepos;
+     EMACS_INT bytepos;
 {
   if (NILP (current_buffer->enable_multibyte_characters))
     return bytepos - 1;
@@ -358,7 +355,7 @@
    valid on return from the subroutine, so the caller should explicitly
    update the global data.  */
 
-static int
+static EMACS_INT
 find_defun_start (pos, pos_byte)
      EMACS_INT pos, pos_byte;
 {




reply via email to

[Prev in Thread] Current Thread [Next in Thread]