[!MULTI_FRAME] (FOR_EACH_FRAME): Fix Lisp_Object vs. int problems.

[bpt/emacs.git] / src / syntax.h

diff --git a/src/syntax.h b/src/syntax.h
index b3c92ca..ed23def 100644 (file)
--- a/src/syntax.h
+++ b/src/syntax.h
@@ -1,5 +1,5 @@
 /* Declarations having to do with GNU Emacs syntax tables.
-   Copyright (C) 1985, 1993 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1993, 1994 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -64,7 +64,7 @@ enum syntaxcode
 #define SYNTAX(c)                                              \
  (RAW_SYNTAX (current_buffer->syntax_table, c) == Sinherit     \
   ? RAW_SYNTAX (Vstandard_syntax_table, c)                     \
-  : RAW_SYNTAX (c))
+  : RAW_SYNTAX (current_buffer->syntax_table, c))
 #endif
 
 /* The next 8 bits of the number is a character,
@@ -83,12 +83,12 @@ enum syntaxcode
       matcher = RAW_SYNTAX_MATCH (Vstandard_syntax_table, character);      \
     else                                                                   \
       matcher = RAW_SYNTAX_MATCH (current_buffer->syntax_table, character); \
-    syntax; })
+    matcher; })
 #else
 #define SYNTAX_MATCH(c)                                                \
  (RAW_SYNTAX (current_buffer->syntax_table, c) == Sinherit     \
   ? RAW_SYNTAX_MATCH (Vstandard_syntax_table, c)                       \
-  : RAW_SYNTAX_MATCH (c))
+  : RAW_SYNTAX_MATCH (current_buffer->syntax_table, c))
 #endif
 
 /* Then there are six single-bit flags that have the following meanings: