[Emacs-diffs] Changes to emacs/src/xfaces.c

[Miles Bader]

Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.298 emacs/src/xfaces.c:1.299
*** emacs/src/xfaces.c:1.298    Mon Jun  7 07:02:20 2004
--- emacs/src/xfaces.c  Tue Jun  8 07:06:19 2004
***************
*** 3169,3176 ****
  
  /* 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.  */
  
  static INLINE int
  push_named_merge_point (struct named_merge_point *new_named_merge_point,
--- 3169,3176 ----
  
  /* 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.  */
  
  static INLINE int
  push_named_merge_point (struct named_merge_point *new_named_merge_point,
***************
*** 3181,3187 ****
  
    for (prev = *named_merge_points; prev; prev = prev->prev)
      if (EQ (face_name, prev->face_name))
!       break;
  
    new_named_merge_point->face_name = face_name;
    new_named_merge_point->prev = *named_merge_points;
--- 3181,3187 ----
  
    for (prev = *named_merge_points; prev; prev = prev->prev)
      if (EQ (face_name, prev->face_name))
!       return 0;
  
    new_named_merge_point->face_name = face_name;
    new_named_merge_point->prev = *named_merge_points;