* doc/lispref/windows.texi (Choosing Window): Mention `no-display-ok'.

* etc/NEWS: Mention new display action alist entry `no-display-ok'.
(Bug#13594)

* lisp/window.el (display-buffer-alist): Doc fix.  (Bug#13594)

2 files changed, 8 insertions, 1 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index e298f79d1c0..16ee55a173c 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-20  Leo Liu  <sdl.web@gmail.com>
+
+        * windows.texi (Choosing Window): Mention `no-display-ok'.  (Bug#13594)
+
 2013-11-19  Xue Fuqiao  <xfq.free@gmail.com>
 
         * os.texi (File Notifications): Add an index.
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 13c9ca53222..8f592dfebb3 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -1842,7 +1842,10 @@ The constant @code{display-buffer-fallback-action}.
 @noindent
 Each action function is called in turn, passing the buffer as the
 first argument and the combined action alist as the second argument,
-until one of the functions returns non-@code{nil}.
+until one of the functions returns non-@code{nil}.  The caller can
+pass @code{(no-display-ok . t)} as an element of the action alist to
+indicate its readiness to handle the case of not displaying the
+buffer.
 
 The argument @var{action} can also have a non-@code{nil}, non-list
 value.  This has the special meaning that the buffer should be