From 4daa09e499b10e6250302341027e39ff5242fa04 Mon Sep 17 00:00:00 2001 From: Stephen Leake Date: Fri, 7 Aug 2015 10:03:59 -0500 Subject: 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. --- doc/lispref/windows.texi | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'doc') 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 frame that meets a predicate (by default any frame other than the current frame). -If @var{alist} has a non-@code{nil} @code{`inhibit-switch-frame} entry, -avoid raising the frame. +If this function chooses a window on another frame, it makes that frame +visible and, unless @var{alist} contains an @code{inhibit-switch-frame} +entry (@pxref{Choosing Window Options}), raises that frame if necessary. If @var{alist} has a non-nil @code{frame-predicate} entry, its value is a function taking one argument (a frame), returning non-nil if the frame is a candidate; this function replaces the default predicate. -If this function chooses a window on another frame, it makes that frame -visible and, unless @var{alist} contains an @code{inhibit-switch-frame} -entry (@pxref{Choosing Window Options}), raises that frame if necessary. +If @var{alist} has a non-@code{nil} @code{inhibit-same-window} entry, +the selected window is used; thus if the selected frame has a single +window, it is not used. + @end defun @defun display-buffer-pop-up-window buffer alist -- cgit v1.2.3-70-g09d2