# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 968505274 0
# Node ID 7ba4ef0eac8d28364988ded6ef01c7d36cf05ec7
# Parent  8fa910d9155bacdcc43456966df93784df34ec6e
(CYCLE_CHECK): Don't use the Lisp_Object returned
by Fmemq in a condition.

diff -r 8fa910d9155b -r 7ba4ef0eac8d src/xfaces.c
--- a/src/xfaces.c	Sat Sep 09 00:50:26 2000 +0000
+++ b/src/xfaces.c	Sat Sep 09 13:14:34 2000 +0000
@@ -3195,16 +3195,16 @@
    CHECK is evaluated multiple times, EL and SUSPICIOUS 0 or 1 times, so
    the caller should make sure that's ok.  */
 
-#define CYCLE_CHECK(check, el, suspicious)				      \
-  (NILP (check)								      \
-   ? make_number (0)							      \
-   : INTEGERP (check)							      \
-   ? (XFASTINT (check) < (suspicious)					      \
-      ? make_number (XFASTINT (check) + 1)				      \
-      : Fcons (el, Qnil))						      \
-   : Fmemq ((el), (check))						      \
-   ? Qnil								      \
-   : Fcons ((el), (check)))
+#define CYCLE_CHECK(check, el, suspicious)	\
+  (NILP (check)					\
+   ? make_number (0)				\
+   : (INTEGERP (check)				\
+      ? (XFASTINT (check) < (suspicious)	\
+	 ? make_number (XFASTINT (check) + 1)	\
+	 : Fcons (el, Qnil))			\
+      : (!NILP (Fmemq ((el), (check)))		\
+	 ? Qnil					\
+	 : Fcons ((el), (check)))))
 
 
 /* Merge face attributes from the face on frame F whose name is