emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r105638: Minor doc fix for last chang


From: Chong Yidong
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r105638: Minor doc fix for last change.
Date: Thu, 01 Sep 2011 22:38:56 -0400
User-agent: Bazaar (2.3.1)

------------------------------------------------------------
revno: 105638
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Thu 2011-09-01 22:38:56 -0400
message:
  Minor doc fix for last change.
modified:
  lisp/window.el
=== modified file 'lisp/window.el'
--- a/lisp/window.el    2011-09-02 02:23:43 +0000
+++ b/lisp/window.el    2011-09-02 02:38:56 +0000
@@ -4564,16 +4564,17 @@
 window, or return nil if it is unable to display the buffer.
 
 `display-buffer' constructs a list of action functions and an
-action alist from `display-buffer-overriding-action',
-`user-action', ACTION, and `display-buffer-default-action' (in
-order).  It calls each action function in turn, passing the
-consolidated action alist as the second argument, until one of
-the functions returns non-nil.
+action alist by combining `display-buffer-overriding-action',
+`display-buffer-alist', the ACTION argument, and
+`display-buffer-default-action' (in that order).  It calls each
+action function in turn, passing the combined action alist as the
+second argument, until one of the functions returns non-nil.
 
-ACTION can also have a non-nil and non-list value.  This means to
-display the buffer in a window other than the selected one, even
-if it is already displayed in the selected window.  If called
-interactively with a prefix argument, ACTION is t.
+The ACTION argument to `display-buffer' can also have a non-nil
+and non-list value.  This means to display the buffer in a window
+other than the selected one, even if it is already displayed in
+the selected window.  If called interactively with a prefix
+argument, ACTION is t.
 
 Optional argument FRAME specifies where to look for a window that
 already displays the buffer.  If nil, check only the selected


reply via email to

[Prev in Thread] Current Thread [Next in Thread]