* faces.el: Revert 2005-11-17 change. :ignore-defface is now

	handled automagically.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 76e7bad9fa78c266277acc610053b5b4b11ebd8c..cfb8872a9378c93d2db0ffc7a81bf7dffe4363e4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-20  Chong Yidong  <cyd@stupidchicken.com>
+
+       * faces.el: Revert 2005-11-17 change.  :ignore-defface is now
+       handled automagically.
+
 2005-11-20  Juri Linkov  <juri@jurta.org>
 
        * simple.el (what-cursor-position):

diff --git a/lisp/faces.el b/lisp/faces.el
index a60805e43018258e48fd8980e73785835bf8ba8b..acb91ad1ed1c5227665f4082357b92afe37c3871 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -357,12 +357,11 @@ 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.
 
-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 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 relative.
+  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,13 +560,8 @@ the default for new frames (this is done automatically each time an
 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.
+face attribute name. All attributes can be set to `unspecified';
+this fact is not further mentioned below.
 
 The following attributes are recognized: