diff options
| author | Stephen Leake | 2015-08-07 10:03:59 -0500 |
|---|---|---|
| committer | Stephen Leake | 2015-08-07 10:03:59 -0500 |
| commit | 4daa09e499b10e6250302341027e39ff5242fa04 (patch) | |
| tree | e1bd561adb08566bbff8de1c5ba27b821c613192 /doc | |
| parent | 701484d524835e3461f521138399893366229ae5 (diff) | |
| download | emacs-4daa09e499b10e6250302341027e39ff5242fa04.tar.gz emacs-4daa09e499b10e6250302341027e39ff5242fa04.zip | |
Add support for 'inhibit-same-window in 'display-buffer-use-some-frame'
* lisp/window.el (display-buffer-use-some-frame): Add support for
'inhibit-same-window in alist.
* doc/windows.texi (display-buffer-use-some-frame): Doc support for
'inhibit-same-window in alist.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/windows.texi | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 41f02aabaa8..ccfe7ffb7bc 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi | |||
| @@ -2306,16 +2306,18 @@ This function tries to ``display'' @var{buffer} by trying to find a | |||
| 2306 | frame that meets a predicate (by default any frame other than the | 2306 | frame that meets a predicate (by default any frame other than the |
| 2307 | current frame). | 2307 | current frame). |
| 2308 | 2308 | ||
| 2309 | If @var{alist} has a non-@code{nil} @code{`inhibit-switch-frame} entry, | 2309 | If this function chooses a window on another frame, it makes that frame |
| 2310 | avoid raising the frame. | 2310 | visible and, unless @var{alist} contains an @code{inhibit-switch-frame} |
| 2311 | entry (@pxref{Choosing Window Options}), raises that frame if necessary. | ||
| 2311 | 2312 | ||
| 2312 | If @var{alist} has a non-nil @code{frame-predicate} entry, its value is a | 2313 | If @var{alist} has a non-nil @code{frame-predicate} entry, its value is a |
| 2313 | function taking one argument (a frame), returning non-nil if the | 2314 | function taking one argument (a frame), returning non-nil if the |
| 2314 | frame is a candidate; this function replaces the default predicate. | 2315 | frame is a candidate; this function replaces the default predicate. |
| 2315 | 2316 | ||
| 2316 | If this function chooses a window on another frame, it makes that frame | 2317 | If @var{alist} has a non-@code{nil} @code{inhibit-same-window} entry, |
| 2317 | visible and, unless @var{alist} contains an @code{inhibit-switch-frame} | 2318 | the selected window is used; thus if the selected frame has a single |
| 2318 | entry (@pxref{Choosing Window Options}), raises that frame if necessary. | 2319 | window, it is not used. |
| 2320 | |||
| 2319 | @end defun | 2321 | @end defun |
| 2320 | 2322 | ||
| 2321 | @defun display-buffer-pop-up-window buffer alist | 2323 | @defun display-buffer-pop-up-window buffer alist |