[Emacs-diffs] Changes to emacs/lisp/faces.el

[Chong Yidong]

Index: emacs/lisp/faces.el
diff -c emacs/lisp/faces.el:1.343 emacs/lisp/faces.el:1.344
*** emacs/lisp/faces.el:1.343   Fri Nov 18 02:25:24 2005
--- emacs/lisp/faces.el Sun Nov 20 15:24:27 2005
***************
*** 357,368 ****
  If FRAME is t, report on the defaults for face FACE (for new frames).
  If FRAME is omitted or nil, use the selected frame.
  
! If INHERIT is nil, only attributes directly defined by FACE are
!   considered, so the return value may be `unspecified',
!   `:ignore-defface', or a relative value.
  If INHERIT is non-nil, FACE's definition of ATTRIBUTE is merged with the
    faces specified by its `:inherit' attribute; however the return value
!   may still be relative.
  If INHERIT is a face or a list of faces, then the result is further merged
    with that face (or faces), until it becomes specified and absolute.
  
--- 357,367 ----
  If FRAME is t, report on the defaults for face FACE (for new frames).
  If FRAME is omitted or nil, use the selected frame.
  
! If INHERIT is nil, only attributes directly defined by FACE are considered,
!   so the return value may be `unspecified', or a relative value.
  If INHERIT is non-nil, FACE's definition of ATTRIBUTE is merged with the
    faces specified by its `:inherit' attribute; however the return value
!   may still be `unspecified' or relative.
  If INHERIT is a face or a list of faces, then the result is further merged
    with that face (or faces), until it becomes specified and absolute.
  
***************
*** 561,573 ****
  attribute is changed on all frames).
  
  ARGS must come in pairs ATTRIBUTE VALUE.  ATTRIBUTE must be a valid
! face attribute name.
! 
! Unless you're certain you know what you're doing, don't set an
! attribute to `unspecified' .  To make a face ignore the attribute
! given in the defface spec, assign it the value `:ignore-defface'.
! You can do this for any attribute; this fact is not further
! mentioned below.
  
  The following attributes are recognized:
  
--- 560,567 ----
  attribute is changed on all frames).
  
  ARGS must come in pairs ATTRIBUTE VALUE.  ATTRIBUTE must be a valid
! face attribute name. All attributes can be set to `unspecified';
! this fact is not further mentioned below.
  
  The following attributes are recognized: