diff src/xfaces.c @ 83113:1a68e4b22355

Merged in changes from CVS trunk. Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-241 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-242 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-243 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-244 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-245 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-246 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-247 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-248 src/lisp.h (CYCLE_CHECK): Macro moved from xfaces.c * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-249 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-250 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-251 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-252 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-253 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-254 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-255 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-153

--- a/src/xfaces.c	Fri Apr 23 14:44:11 2004 +0000
+++ b/src/xfaces.c	Tue Apr 27 15:53:30 2004 +0000
@@ -3482,32 +3482,6 @@
   to[LFACE_INHERIT_INDEX] = Qnil;
 }
 
-
-/* Checks the `cycle check' variable CHECK to see if it indicates that
-   EL is part of a cycle; CHECK must be either Qnil or a value returned
-   by an earlier use of CYCLE_CHECK.  SUSPICIOUS is the number of
-   elements after which a cycle might be suspected; after that many
-   elements, this macro begins consing in order to keep more precise
-   track of elements.
-
-   Returns nil if a cycle was detected, otherwise a new value for CHECK
-   that includes EL.
-
-   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))			\
-      : (!NILP (Fmemq ((el), (check)))		\
-	 ? Qnil					\
-	 : Fcons ((el), (check)))))
-
-
 /* Merge face attributes from the face on frame F whose name is
    INHERITS, into the vector of face attributes TO; INHERITS may also be
    a list of face names, in which case they are applied in order.