# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1132500267 0
# Node ID 580816de789fb2106e0a85adc1c05912d73f6d84
# Parent  5d9dc617268a98dd69d635171776d35e5f786fab
	* faces.el: Revert 2005-11-17 change.  :ignore-defface is now
	handled automagically.

diff -r 5d9dc617268a -r 580816de789f lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Nov 20 15:24:02 2005 +0000
+++ b/lisp/ChangeLog	Sun Nov 20 15:24:27 2005 +0000
@@ -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 -r 5d9dc617268a -r 580816de789f lisp/faces.el
--- a/lisp/faces.el	Sun Nov 20 15:24:02 2005 +0000
+++ b/lisp/faces.el	Sun Nov 20 15:24:27 2005 +0000
@@ -357,12 +357,11 @@
 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 @@
 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: