[Emacs-diffs] trunk r115153: * doc/lispref/windows.texi (Choosing Window): Mention `no-display-ok'.

[Leo Liu]

------------------------------------------------------------
revno: 115153
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/13594
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Wed 2013-11-20 10:44:38 +0800
message:
  * 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)
modified:
  doc/lispref/ChangeLog          changelog-20091113204419-o5vbwnq5f7feedwu-6155
  doc/lispref/windows.texi       
windows.texi-20091113204419-o5vbwnq5f7feedwu-6224
  etc/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1485
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/window.el                 window.el-20091113204419-o5vbwnq5f7feedwu-94

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2013-11-19 09:47:02 +0000
+++ b/doc/lispref/ChangeLog     2013-11-20 02:44:38 +0000
@@ -1,3 +1,7 @@
+2013-11-20  Leo Liu  <address@hidden>
+
+       * windows.texi (Choosing Window): Mention `no-display-ok'.  (Bug#13594)
+
 2013-11-19  Xue Fuqiao  <address@hidden>
 
        * os.texi (File Notifications): Add an index.

=== modified file 'doc/lispref/windows.texi'
--- a/doc/lispref/windows.texi  2013-08-05 11:37:47 +0000
+++ b/doc/lispref/windows.texi  2013-11-20 02:44:38 +0000
@@ -1842,7 +1842,10 @@
 @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 address@hidden
+until one of the functions returns address@hidden  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 address@hidden, non-list
 value.  This has the special meaning that the buffer should be

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2013-11-18 02:27:12 +0000
+++ b/etc/ChangeLog     2013-11-20 02:44:38 +0000
@@ -1,3 +1,8 @@
+2013-11-20  Leo Liu  <address@hidden>
+
+       * NEWS: Mention new display action alist entry `no-display-ok'.
+       (Bug#13594)
+
 2013-11-18  Leo Liu  <address@hidden>
 
        * NEWS: Mention new features for Octave mode.

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2013-11-19 02:26:34 +0000
+++ b/etc/NEWS  2013-11-20 02:44:38 +0000
@@ -1800,6 +1800,10 @@
 *** New option `switch-to-buffer-preserve-window-point' to restore a
 window's point when switching buffers.
 
+*** New display action alist entry `no-display-ok' to indicate the
+caller of `display-buffer' is ready to handle the case of not
+displaying the buffer.
+
 *** New display action alist entries `window-height' and `window-width'
 specify the size of new windows created by `display-buffer'.
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-19 20:23:53 +0000
+++ b/lisp/ChangeLog    2013-11-20 02:44:38 +0000
@@ -1,3 +1,7 @@
+2013-11-20  Leo Liu  <address@hidden>
+
+       * window.el (display-buffer-alist): Doc fix.  (Bug#13594)
+
 2013-11-19  Dan Nicolaescu  <address@hidden>
 
        * vc/vc-git.el (vc-git-dir-extra-headers): Add headers

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2013-11-19 02:34:04 +0000
+++ b/lisp/window.el    2013-11-20 02:44:38 +0000
@@ -5355,15 +5355,17 @@
  ACTION is a cons cell (FUNCTION . ALIST), where FUNCTION is a
   function or a list of functions.  Each such function should
   accept two arguments: a buffer to display and an alist of the
-  same form as ALIST.  If (no-display-ok . t) is in ALIST, the
-  caller is prepared for the case of not displaying the buffer
-  and FUNCTION can safely return a non-window value to suppress
-  displaying.  See `display-buffer' for details.
+  same form as ALIST.  See `display-buffer' for details.
 
 `display-buffer' scans this alist until it either finds a
 matching regular expression or the function specified by a
-condition returns non-nil.  In any of these cases, it adds the
-associated action to the list of actions it will try."
+condition returns non-nil.  It can pass (no-display-ok . t) in
+its action alist to indicate readiness for the case of not
+displaying the buffer and FUNCTION can safely return a non-window
+value to suppress displaying.
+
+In any of these cases, it adds the associated action to the list
+of actions it will try."
   :type `(alist :key-type
                (choice :tag "Condition"
                        regexp