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

[Juanma Barranquero]

Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.322 emacs/src/xfaces.c:1.323
*** emacs/src/xfaces.c:1.322    Wed Jun  1 08:21:25 2005
--- emacs/src/xfaces.c  Fri Jun  3 10:39:29 2005
***************
*** 5022,5029 ****
  DEFUN ("internal-lisp-face-equal-p", Finternal_lisp_face_equal_p,
         Sinternal_lisp_face_equal_p, 2, 3, 0,
         doc: /* True if FACE1 and FACE2 are equal.
! If the optional argument FRAME is given, report on face FACE in that frame.
! If FRAME is t, report on the defaults for face FACE (for new frames).
  If FRAME is omitted or nil, use the selected frame.  */)
       (face1, face2, frame)
       Lisp_Object face1, face2, frame;
--- 5022,5029 ----
  DEFUN ("internal-lisp-face-equal-p", Finternal_lisp_face_equal_p,
         Sinternal_lisp_face_equal_p, 2, 3, 0,
         doc: /* True if FACE1 and FACE2 are equal.
! If the optional argument FRAME is given, report on FACE1 and FACE2 in that 
frame.
! If FRAME is t, report on the defaults for FACE1 and FACE2 (for new frames).
  If FRAME is omitted or nil, use the selected frame.  */)
       (face1, face2, frame)
       Lisp_Object face1, face2, frame;
***************
*** 5041,5048 ****
         Emacs.  That frame is not an X frame.  */
      f = frame_or_selected_frame (frame, 2);
  
!   lface1 = lface_from_face_name (NULL, face1, 1);
!   lface2 = lface_from_face_name (NULL, face2, 1);
    equal_p = lface_equal_p (XVECTOR (lface1)->contents,
                           XVECTOR (lface2)->contents);
    return equal_p ? Qt : Qnil;
--- 5041,5048 ----
         Emacs.  That frame is not an X frame.  */
      f = frame_or_selected_frame (frame, 2);
  
!   lface1 = lface_from_face_name (f, face1, 1);
!   lface2 = lface_from_face_name (f, face2, 1);
    equal_p = lface_equal_p (XVECTOR (lface1)->contents,
                           XVECTOR (lface2)->contents);
    return equal_p ? Qt : Qnil;