* display.texi: Revert 2005-11-20 change.

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 5aa075a1eae1bff7ce48be3dfab0dbe4fda5760c..b580d418bec458d20fd95f0b407bd8efdd3ef3a7 100644 (file)
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-20  Chong Yidong  <cyd@stupidchicken.com>
+
+       * display.texi: Revert 2005-11-20 change.
+
 2005-11-20  Thien-Thi Nguyen  <ttn@gnu.org>
 
        * processes.texi (Bindat Functions):

diff --git a/lispref/display.texi b/lispref/display.texi
index 00d9313aa244b6fa83d5b091e2be6074972b79ed..75a64924516b4db0612e91d803cbecec95cc16fa 100644 (file)
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -1859,11 +1859,6 @@ the first face fails to specify a particular attribute, that means the
 next face gets a chance.  However, the @code{default} face must
 specify all attributes.
 
-  Any attribute can have the value @code{:ignore-defface}.  The effect
-of this is identical to @code{unspecified}.  It exists because of an
-technical ambiguity in giving attributes the value @code{unspecified}.
-@xref{Attribute Functions}.
-
   Some of these font attributes are meaningful only on certain kinds of
 displays---if your display cannot handle a certain attribute, the
 attribute is ignored.  (The attributes @code{:family}, @code{:width},
@@ -2056,14 +2051,6 @@ This function sets one or more attributes of face @var{face}
 for frame @var{frame}.  If @var{frame} is @code{nil}, it sets
 the attribute for all frames, and the defaults for new frames.
 
-Unless you know what you're doing, don't set an attribute to
-@code{unspecified}.  This is ambiguous---it is unclear whether it
-means to unspecify the value stored in the frame-local copies of the
-face (which means reverting to the original face spec), or the value
-in the face spec itself.  What you probably want is to set the
-attribute to @code{:ignore-defface}.  This forces the attribute value
-to be acquired from some other face during face merging.
-
 The extra arguments @var{arguments} specify the attributes to set, and
 the values for them.  They should consist of alternating attribute names
 (such as @code{:family} or @code{:underline}) and corresponding values.