Mercurial > emacs

changeset 31522:7ba4ef0eac8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(CYCLE_CHECK): Don't use the Lisp_Object returned by Fmemq in a condition.
author Gerd Moellmann <gerd@gnu.org>
date Sat, 09 Sep 2000 13:14:34 +0000
parents 8fa910d9155b
children 8e99da3fa239
files src/xfaces.c
diffstat 1 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- 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