diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2016-08-30 12:30:29 +0200 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2016-08-30 12:30:29 +0200 |
| commit | 4961cc3f368d9114c305efe6243987bcfa3fd29b (patch) | |
| tree | 8aa4e8baf1f2efeca29a4e40adae8d720da9d587 /doc | |
| parent | bcd2d911f35fd28f0a0051f237dc76f15cea4b4a (diff) | |
In `pop-to-buffer' handle case where `display-buffer' fails (Bug#24332)
* lisp/window.el (pop-to-buffer): Don't assume that
`display-buffer' has supplied a window (Bug#24332).
Rename BUFFER argument to BUFFER-OR-NAME.
* doc/lispref/windows.texi (Switching Buffers): Fix
`pop-to-buffer' documentation.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/windows.texi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 36bccdd30a..3c9df0b306 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -2233,15 +2233,15 @@ This function makes @var{buffer-or-name} the current buffer and displays it in some window, preferably not the window currently selected. It then selects the displaying window. If that window is on a different graphical frame, that frame is given input focus if -possible (@pxref{Input Focus}). The return value is the buffer that -was switched to. +possible (@pxref{Input Focus}). If @var{buffer-or-name} is @code{nil}, it defaults to the buffer returned by @code{other-buffer} (@pxref{Buffer List}). If @var{buffer-or-name} is a string that is not the name of any existing buffer, this function creates a new buffer with that name; the new buffer's major mode is determined by the variable @code{major-mode} -(@pxref{Major Modes}). +(@pxref{Major Modes}). In any case, that buffer is made current and +returned, even when no suitable window was found to display it. If @var{action} is non-@code{nil}, it should be a display action to pass to @code{display-buffer} (@pxref{Choosing Window}). |