1 files changed, 19 insertions, 19 deletions
diff --git a/src/syntax.h b/src/syntax.h
index f86ab8fc265..cb1eeb62687 100644
--- a/src/syntax.h
+++ b/src/syntax.h
@@ -68,16 +68,16 @@ enum syntaxcode
 #ifdef __GNUC__
 #define SYNTAX_ENTRY_FOLLOW_PARENT(table, c)                    \
-  ({ Lisp_Object tbl = table;                                   \
+  ({ Lisp_Object _syntax_tbl = (table);                         \
-     Lisp_Object temp = XCHAR_TABLE (tbl)->contents[(c)];       \
+     Lisp_Object _syntax_temp = XCHAR_TABLE (_syntax_tbl)->contents[(c)]; \
-     while (NILP (temp))                                        \
+     while (NILP (_syntax_temp))                                \
       {                                                        \
-         tbl = XCHAR_TABLE (tbl)->parent;                       \
+         _syntax_tbl = XCHAR_TABLE (_syntax_tbl)->parent;       \
-         if (NILP (tbl))                                        \
+         if (NILP (_syntax_tbl))                                \
           break;                                               \
-         temp = XCHAR_TABLE (tbl)->contents[(c)];               \
+         _syntax_temp = XCHAR_TABLE (_syntax_tbl)->contents[(c)]; \
       }                                                        \
-     temp; })
+     _syntax_temp; })
 #else
 extern Lisp_Object syntax_temp;
 extern Lisp_Object syntax_parent_lookup P_ ((Lisp_Object, int));
@@ -117,24 +117,24 @@ extern Lisp_Object syntax_parent_lookup P_ ((Lisp_Object, int));
 #ifdef __GNUC__
 #define SYNTAX(c)                                                       \
-  ({ Lisp_Object temp;                                                  \
+  ({ Lisp_Object _syntax_temp;                                          \
-     temp = SYNTAX_ENTRY (c);                                           \
+     _syntax_temp = SYNTAX_ENTRY (c);                                   \
-     (CONSP (temp)                                                      \
+     (CONSP (_syntax_temp)                                              \
-      ? (enum syntaxcode) (XINT (XCAR (temp)) & 0xff)           \
+      ? (enum syntaxcode) (XINT (XCAR (_syntax_temp)) & 0xff)           \
      : Swhitespace); })
 #define SYNTAX_WITH_FLAGS(c)                                            \
-  ({ Lisp_Object temp;                                                  \
+  ({ Lisp_Object _syntax_temp;                                          \
-     temp = SYNTAX_ENTRY (c);                                           \
+     _syntax_temp = SYNTAX_ENTRY (c);                                   \
-     (CONSP (temp)                                                      \
+     (CONSP (_syntax_temp)                                              \
-      ? XINT (XCAR (temp))                                      \
+      ? XINT (XCAR (_syntax_temp))                                      \
      : (int) Swhitespace); })
 #define SYNTAX_MATCH(c)                                                 \
-  ({ Lisp_Object temp;                                                  \
+  ({ Lisp_Object _syntax_temp;                                          \
-     temp = SYNTAX_ENTRY (c);                                           \
+     _syntax_temp = SYNTAX_ENTRY (c);                                   \
-     (CONSP (temp)                                                      \
+     (CONSP (_syntax_temp)                                              \
-      ? XCDR (temp)                                             \
+      ? XCDR (_syntax_temp)                                             \
      : Qnil); })
 #else
 #define SYNTAX(c)                                                       \

diff --git a/src/syntax.h b/src/syntax.h index f86ab8fc265..cb1eeb62687 100644 --- a/src/syntax.h +++ b/src/syntax.h
@@ -68,16 +68,16 @@ enum syntaxcode
68		68
69	#ifdef __GNUC__	69	#ifdef __GNUC__
70	#define SYNTAX_ENTRY_FOLLOW_PARENT(table, c) \	70	#define SYNTAX_ENTRY_FOLLOW_PARENT(table, c) \
71	({ Lisp_Object tbl = table; \	71	({ Lisp_Object _syntax_tbl = (table); \
72	Lisp_Object temp = XCHAR_TABLE (tbl)->contents[(c)]; \	72	Lisp_Object _syntax_temp = XCHAR_TABLE (_syntax_tbl)->contents[(c)]; \
73	while (NILP (temp)) \	73	while (NILP (_syntax_temp)) \
74	{ \	74	{ \
75	tbl = XCHAR_TABLE (tbl)->parent; \	75	_syntax_tbl = XCHAR_TABLE (_syntax_tbl)->parent; \
76	if (NILP (tbl)) \	76	if (NILP (_syntax_tbl)) \
77	break; \	77	break; \
78	temp = XCHAR_TABLE (tbl)->contents[(c)]; \	78	_syntax_temp = XCHAR_TABLE (_syntax_tbl)->contents[(c)]; \
79	} \	79	} \
80	temp; })	80	_syntax_temp; })
81	#else	81	#else
82	extern Lisp_Object syntax_temp;	82	extern Lisp_Object syntax_temp;
83	extern Lisp_Object syntax_parent_lookup P_ ((Lisp_Object, int));	83	extern Lisp_Object syntax_parent_lookup P_ ((Lisp_Object, int));
@@ -117,24 +117,24 @@ extern Lisp_Object syntax_parent_lookup P_ ((Lisp_Object, int));
117		117
118	#ifdef __GNUC__	118	#ifdef __GNUC__
119	#define SYNTAX(c) \	119	#define SYNTAX(c) \
120	({ Lisp_Object temp; \	120	({ Lisp_Object _syntax_temp; \
121	temp = SYNTAX_ENTRY (c); \	121	_syntax_temp = SYNTAX_ENTRY (c); \
122	(CONSP (temp) \	122	(CONSP (_syntax_temp) \
123	? (enum syntaxcode) (XINT (XCAR (temp)) & 0xff) \	123	? (enum syntaxcode) (XINT (XCAR (_syntax_temp)) & 0xff) \
124	: Swhitespace); })	124	: Swhitespace); })
125		125
126	#define SYNTAX_WITH_FLAGS(c) \	126	#define SYNTAX_WITH_FLAGS(c) \
127	({ Lisp_Object temp; \	127	({ Lisp_Object _syntax_temp; \
128	temp = SYNTAX_ENTRY (c); \	128	_syntax_temp = SYNTAX_ENTRY (c); \
129	(CONSP (temp) \	129	(CONSP (_syntax_temp) \
130	? XINT (XCAR (temp)) \	130	? XINT (XCAR (_syntax_temp)) \
131	: (int) Swhitespace); })	131	: (int) Swhitespace); })
132		132
133	#define SYNTAX_MATCH(c) \	133	#define SYNTAX_MATCH(c) \
134	({ Lisp_Object temp; \	134	({ Lisp_Object _syntax_temp; \
135	temp = SYNTAX_ENTRY (c); \	135	_syntax_temp = SYNTAX_ENTRY (c); \
136	(CONSP (temp) \	136	(CONSP (_syntax_temp) \
137	? XCDR (temp) \	137	? XCDR (_syntax_temp) \
138	: Qnil); })	138	: Qnil); })
139	#else	139	#else
140	#define SYNTAX(c) \	140	#define SYNTAX(c) \