diff options
| author | Chong Yidong | 2011-09-01 22:38:56 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-09-01 22:38:56 -0400 |
| commit | 2a7bdc1a6f23854cbac90a29907367a1b8cd54d9 (patch) | |
| tree | 9e0b92656b74cf76b0ebe2ea5036d6a7301ee038 | |
| parent | 89894cd8be3e7d8f77474c9146ccad75cac07ddf (diff) | |
| download | emacs-2a7bdc1a6f23854cbac90a29907367a1b8cd54d9.tar.gz emacs-2a7bdc1a6f23854cbac90a29907367a1b8cd54d9.zip | |
Minor doc fix for last change.
| -rw-r--r-- | lisp/window.el | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/lisp/window.el b/lisp/window.el index b33c46acf93..8bdf4131c51 100644 --- a/lisp/window.el +++ b/lisp/window.el | |||
| @@ -4564,16 +4564,17 @@ alist. It should either display the buffer and return the | |||
| 4564 | window, or return nil if it is unable to display the buffer. | 4564 | window, or return nil if it is unable to display the buffer. |
| 4565 | 4565 | ||
| 4566 | `display-buffer' constructs a list of action functions and an | 4566 | `display-buffer' constructs a list of action functions and an |
| 4567 | action alist from `display-buffer-overriding-action', | 4567 | action alist by combining `display-buffer-overriding-action', |
| 4568 | `user-action', ACTION, and `display-buffer-default-action' (in | 4568 | `display-buffer-alist', the ACTION argument, and |
| 4569 | order). It calls each action function in turn, passing the | 4569 | `display-buffer-default-action' (in that order). It calls each |
| 4570 | consolidated action alist as the second argument, until one of | 4570 | action function in turn, passing the combined action alist as the |
| 4571 | the functions returns non-nil. | 4571 | second argument, until one of the functions returns non-nil. |
| 4572 | 4572 | ||
| 4573 | ACTION can also have a non-nil and non-list value. This means to | 4573 | The ACTION argument to `display-buffer' can also have a non-nil |
| 4574 | display the buffer in a window other than the selected one, even | 4574 | and non-list value. This means to display the buffer in a window |
| 4575 | if it is already displayed in the selected window. If called | 4575 | other than the selected one, even if it is already displayed in |
| 4576 | interactively with a prefix argument, ACTION is t. | 4576 | the selected window. If called interactively with a prefix |
| 4577 | argument, ACTION is t. | ||
| 4577 | 4578 | ||
| 4578 | Optional argument FRAME specifies where to look for a window that | 4579 | Optional argument FRAME specifies where to look for a window that |
| 4579 | already displays the buffer. If nil, check only the selected | 4580 | already displays the buffer. If nil, check only the selected |