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

[Chong Yidong]

Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.340 emacs/src/xfaces.c:1.341
*** emacs/src/xfaces.c:1.340    Fri Nov 18 03:55:45 2005
--- emacs/src/xfaces.c  Sun Nov 20 15:22:31 2005
***************
*** 4054,4060 ****
  
    /* Set lface to the Lisp attribute vector of FACE.  */
    if (EQ (frame, Qt))
!     lface = lface_from_face_name (NULL, face, 1);
    else
      {
        if (NILP (frame))
--- 4054,4064 ----
  
    /* Set lface to the Lisp attribute vector of FACE.  */
    if (EQ (frame, Qt))
!     {
!       lface = lface_from_face_name (NULL, face, 1);
!       if (UNSPECIFIEDP (value))
!       value = Qignore_defface;
!     }
    else
      {
        if (NILP (frame))
***************
*** 4879,4884 ****
--- 4883,4891 ----
      value = LFACE_FONT (lface);
    else
      signal_error ("Invalid face attribute name", keyword);
+ 
+   if (IGNORE_DEFFACE_P (value))
+     return Qunspecified;
  
    return value;
  }