procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-385

Browse source 
src/xfaces.c (push_named_merge_point): Return 0 if a cycle is detected
This commit is contained in:
Miles Bader 2004-06-08 07:06:19 +00:00
parent 5f29a6c8cc
commit 6e87ac8f55
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -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)

6
src/xfaces.c
View file

@ -3169,8 +3169,8 @@ struct named_merge_point
/* 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 @@ push_named_merge_point (struct named_merge_point *new_named_merge_point,
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;