Doc fix for `face-spec-set'.

* doc/lispref/display.texi (Defining Faces): Doc fix for
  `face-spec-set'.

* etc/NEWS: Copyedit.

3 files changed, 20 insertions, 15 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 650f97375d6..b7148b92186 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,7 @@
 2014-02-28  Xue Fuqiao  <xfq@gnu.org>
 
+        * display.texi (Defining Faces): Doc fix for `face-spec-set'.
+
         * elisp.texi (Top):
         * commands.texi (Generic Commands):
         (Defining Commands): Document `define-alternatives'.
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 496fbf87041..9aae04ae32a 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2359,16 +2359,20 @@ This function applies @var{spec} as a face spec for @code{face}.
 @var{spec} should be a face spec, as described in the above
 documentation for @code{defface}.
 
+This function also defines @var{face} as a valid face name if it is
+not already one, and (re)calculates its attributes on existing frames.
+
 @cindex override spec @r{(for a face)}
 The argument @var{spec-type} determines which spec to set.  If it is
 @code{nil} or @code{face-override-spec}, this function sets the
 @dfn{override spec}, which overrides over all other face specs on
-@var{face}.  If it is @code{face-defface-spec}, this function sets the
-default face spec (the same one set by @code{defface}).  If it is
-@code{reset}, this function clears out all customization specs and
-override specs from @var{face} (in this case, the value of @var{spec}
-is ignored).  Any other value of @var{spec-type} is reserved for
-internal use.
+@var{face}.  If it is @code{customized-face} or @code{saved-face},
+this function sets the customized spec or the saved custom spec.  If
+it is @code{face-defface-spec}, this function sets the default face
+spec (the same one set by @code{defface}).  If it is @code{reset},
+this function clears out all customization specs and override specs
+from @var{face} (in this case, the value of @var{spec} is ignored).
+Any other value of @var{spec-type} is reserved for internal use.
 @end defun
 
 @node Attribute Functions
diff --git a/etc/NEWS b/etc/NEWS
index 3d45dfb8011..befe939a0e0 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -278,6 +278,13 @@ buffer.
 `display-buffer' choose or make a window at the bottom of the selected
 frame.
 
+*** New display action function `display-buffer-no-window' to not
+display the buffer in a window.
+
+*** New display action alist entry `allow-no-window' to indicate the
+caller of `display-buffer' is ready to handle the case of not
+displaying the buffer in a window.
+
 ** Lisp evaluation changes
 +++
 *** `eval-defun' on an already defined defcustom calls the :set function,
@@ -1224,15 +1231,6 @@ frame.
 *** The hook `term-setup-hook' is obsolete.  It is entirely equivalent
 to `emacs-startup-hook'.  See also the new `tty-setup-hook'.
 
-** Window Handling
-
-*** New display action function `display-buffer-no-window' to not
-display the buffer in a window.
-
-*** New display action alist entry `allow-no-window' to indicate the
-caller of `display-buffer' is ready to handle the case of not
-displaying the buffer in a window.
-
 ** New hook `pre-redisplay-function'.
 
 +++
@@ -1353,6 +1351,7 @@ of remote files when set to non-nil.
 
 ** Face changes
 
++++
 *** The function `face-spec-set' is now like `setq' for face specs.
 Its third arg now accepts values specifying a face spec type (defface,
 custom, or override spec), and the relevant spec is set accordingly.