# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1086678379 0
# Node ID de4c259f651bdd761272153fb84d3cc57016056a
# Parent  92b7aae8907e89866fbb4a40702629a7a12b441b
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-385

src/xfaces.c (push_named_merge_point): Return 0 if a cycle is detected

diff -r 92b7aae8907e -r de4c259f651b src/ChangeLog
--- a/src/ChangeLog	Tue Jun 08 00:36:04 2004 +0000
+++ b/src/ChangeLog	Tue Jun 08 07:06:19 2004 +0000
@@ -1,3 +1,7 @@
+2004-06-08  Miles Bader  <miles@gnu.org>
+
+	* xfaces.c (push_named_merge_point): Return 0 when a cycle is detected.
+
 2004-06-07  Juanma Barranquero  <lektu@terra.es>
 
 	* editfns.c (Fuser_login_name, Ffloat_time, Fencode_time)
diff -r 92b7aae8907e -r de4c259f651b src/xfaces.c
--- a/src/xfaces.c	Tue Jun 08 00:36:04 2004 +0000
+++ b/src/xfaces.c	Tue Jun 08 07:06:19 2004 +0000
@@ -3169,8 +3169,8 @@
 
 /* If a face merging cycle is detected for FACE_NAME, return 0,
    otherwise add NEW_NAMED_MERGE_POINT, which is initialized using
-   FACE_NAME, as the head of the linked list
-   pointed to by NAMED_MERGE_POINTS, and return 1.  */
+   FACE_NAME, as the head of the linked list pointed to by
+   NAMED_MERGE_POINTS, and return 1.  */
 
 static INLINE int
 push_named_merge_point (struct named_merge_point *new_named_merge_point,
@@ -3181,7 +3181,7 @@
 
   for (prev = *named_merge_points; prev; prev = prev->prev)
     if (EQ (face_name, prev->face_name))
-	break;
+      return 0;
 
   new_named_merge_point->face_name = face_name;
   new_named_merge_point->prev = *named_merge_points;