--- a/src/syntax.h	Mon Aug 13 11:12:06 2007 +0200
+++ b/src/syntax.h	Mon Aug 13 11:13:30 2007 +0200
@@ -20,8 +20,8 @@
 
 /* Synched up with: FSF 19.28. */
 
-#ifndef _XEMACS_SYNTAX_H_
-#define _XEMACS_SYNTAX_H_
+#ifndef INCLUDED_syntax_h_
+#define INCLUDED_syntax_h_
 
 #include "chartab.h"
 
@@ -72,9 +72,9 @@
 #define SYNTAX_CODE_UNSAFE(table, c) \
    XINT (CHAR_TABLE_VALUE_UNSAFE (table, c))
 
-INLINE int SYNTAX_CODE (struct Lisp_Char_Table *table, Emchar c);
+INLINE int SYNTAX_CODE (Lisp_Char_Table *table, Emchar c);
 INLINE int
-SYNTAX_CODE (struct Lisp_Char_Table *table, Emchar c)
+SYNTAX_CODE (Lisp_Char_Table *table, Emchar c)
 {
   return SYNTAX_CODE_UNSAFE (table, c);
 }
@@ -85,9 +85,9 @@
 #define SYNTAX_FROM_CODE(code) ((enum syntaxcode) ((code) & 0177))
 #define SYNTAX(table, c) SYNTAX_FROM_CODE (SYNTAX_CODE (table, c))
 
-INLINE int WORD_SYNTAX_P (struct Lisp_Char_Table *table, Emchar c);
+INLINE int WORD_SYNTAX_P (Lisp_Char_Table *table, Emchar c);
 INLINE int
-WORD_SYNTAX_P (struct Lisp_Char_Table *table, Emchar c)
+WORD_SYNTAX_P (Lisp_Char_Table *table, Emchar c)
 {
   return SYNTAX (table, c) == Sword;
 }
@@ -170,13 +170,19 @@
 #define SYNTAX_SECOND_CHAR_END   0x03
 #define SYNTAX_SECOND_CHAR       0x33
 
-#define SYNTAX_START_P(table, a, b)					\
-  ((SYNTAX_COMMENT_BITS (table, a) & SYNTAX_FIRST_CHAR_START)		\
-   && (SYNTAX_COMMENT_BITS (table, b) & SYNTAX_SECOND_CHAR_START))
 
-#define SYNTAX_END_P(table, a, b)					\
-  ((SYNTAX_COMMENT_BITS (table, a) & SYNTAX_FIRST_CHAR_END)		\
-   && (SYNTAX_COMMENT_BITS (table, b) & SYNTAX_SECOND_CHAR_END))
+/* #### These are now more or less equivalent to
+   SYNTAX_COMMENT_MATCH_START ...*/
+/* a and b must be first and second start chars for a common type */
+#define SYNTAX_START_P(table, a, b)                                     \
+  (((SYNTAX_COMMENT_BITS (table, a) & SYNTAX_FIRST_CHAR_START) >> 2)    \
+   & (SYNTAX_COMMENT_BITS (table, b) & SYNTAX_SECOND_CHAR_START))
+
+/* ... and  SYNTAX_COMMENT_MATCH_END */
+/* a and b must be first and second end chars for a common type */
+#define SYNTAX_END_P(table, a, b)                                       \
+  (((SYNTAX_COMMENT_BITS (table, a) & SYNTAX_FIRST_CHAR_END) >> 2)      \
+   & (SYNTAX_COMMENT_BITS (table, b) & SYNTAX_SECOND_CHAR_END))
 
 #define SYNTAX_STYLES_MATCH_START_P(table, a, b, mask)			    \
   ((SYNTAX_COMMENT_BITS (table, a) & SYNTAX_FIRST_CHAR_START & (mask))	    \
@@ -232,15 +238,15 @@
    that character signifies (as a char).
    For example, (enum syntaxcode) syntax_spec_code['w'] is Sword. */
 
-extern CONST unsigned char syntax_spec_code[0400];
+extern const unsigned char syntax_spec_code[0400];
 
 /* Indexed by syntax code, give the letter that describes it. */
 
-extern CONST unsigned char syntax_code_spec[];
+extern const unsigned char syntax_code_spec[];
 
-Lisp_Object scan_lists (struct buffer *buf, int from, int count,
+Lisp_Object scan_lists (struct buffer *buf, Bufpos from, int count,
 			int depth, int sexpflag, int no_error);
-int char_quoted (struct buffer *buf, int pos);
+int char_quoted (struct buffer *buf, Bufpos pos);
 
 /* NOTE: This does not refer to the mirror table, but to the
    syntax table itself. */
@@ -249,6 +255,6 @@
 extern int no_quit_in_re_search;
 extern struct buffer *regex_emacs_buffer;
 
-void update_syntax_table (struct Lisp_Char_Table *ct);
+void update_syntax_table (Lisp_Char_Table *ct);
 
-#endif /* _XEMACS_SYNTAX_H_ */
+#endif /* INCLUDED_syntax_h_ */