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

[Miles Bader]

Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.281.2.18 emacs/src/xfaces.c:1.281.2.19
*** emacs/src/xfaces.c:1.281.2.18       Fri Nov 12 02:52:55 2004
--- emacs/src/xfaces.c  Wed Dec  8 05:02:18 2004
***************
*** 3069,3075 ****
      {
        /* This is of limited utility since it works with character
         widths.  Keep it for compatibility.  --gerd.  */
!       int face_id = lookup_named_face (f, face);
        struct face *face = (face_id < 0
                           ? NULL
                           : FACE_FROM_ID (f, face_id));
--- 3069,3075 ----
      {
        /* This is of limited utility since it works with character
         widths.  Keep it for compatibility.  --gerd.  */
!       int face_id = lookup_named_face (f, face, 0);
        struct face *face = (face_id < 0
                           ? NULL
                           : FACE_FROM_ID (f, face_id));
***************
*** 5015,5021 ****
    else
      {
        struct frame *f = frame_or_selected_frame (frame, 1);
!       int face_id = lookup_named_face (f, face);
        struct face *face = FACE_FROM_ID (f, face_id);
  
        if (! face)
--- 5015,5021 ----
    else
      {
        struct frame *f = frame_or_selected_frame (frame, 1);
!       int face_id = lookup_named_face (f, face, 1);
        struct face *face = FACE_FROM_ID (f, face_id);
  
        if (! face)
***************
*** 5753,5761 ****
     face isn't realized and cannot be realized.  */
  
  int
! lookup_named_face (f, symbol)
       struct frame *f;
       Lisp_Object symbol;
  {
    Lisp_Object attrs[LFACE_VECTOR_SIZE];
    Lisp_Object symbol_attrs[LFACE_VECTOR_SIZE];
--- 5753,5762 ----
     face isn't realized and cannot be realized.  */
  
  int
! lookup_named_face (f, symbol, signal_p)
       struct frame *f;
       Lisp_Object symbol;
+      int signal_p;
  {
    Lisp_Object attrs[LFACE_VECTOR_SIZE];
    Lisp_Object symbol_attrs[LFACE_VECTOR_SIZE];
***************
*** 5768,5774 ****
        default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
      }
  
!   get_lface_attributes (f, symbol, symbol_attrs, 1);
    bcopy (default_face->lface, attrs, sizeof attrs);
    merge_face_vectors (f, symbol_attrs, attrs, 0);
  
--- 5769,5777 ----
        default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID);
      }
  
!   if (!get_lface_attributes (f, symbol, symbol_attrs, signal_p))
!     return -1;
! 
    bcopy (default_face->lface, attrs, sizeof attrs);
    merge_face_vectors (f, symbol_attrs, attrs, 0);
  
***************
*** 5789,5795 ****
    if (lface_id >= 0 && lface_id < lface_id_to_name_size)
      {
        Lisp_Object face_name = lface_id_to_name[lface_id];
!       face_id = lookup_named_face (f, face_name);
      }
    else
      face_id = -1;
--- 5792,5798 ----
    if (lface_id >= 0 && lface_id < lface_id_to_name_size)
      {
        Lisp_Object face_name = lface_id_to_name[lface_id];
!       face_id = lookup_named_face (f, face_name, 1);
      }
    else
      face_id = -1;