aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Leake2015-07-29 19:23:19 -0500
committerStephen Leake2015-07-29 19:23:19 -0500
commit3b9d689c2abb294250de6c690d77e9175952be72 (patch)
tree86ea017fe12739fb7145721be0f938b1e57d5ec0
parent72fea2fac543558cd2c4bd55e6f714f9f43efbc3 (diff)
downloademacs-3b9d689c2abb294250de6c690d77e9175952be72.tar.gz
emacs-3b9d689c2abb294250de6c690d77e9175952be72.zip
Add docs for display-buffer action display-buffer-use-some-frame
* lisp/window.el (display-buffer-use-some-frame): improve doc string * doc/lispref/windows.texi (Display Action Functions): add display-buffer-use-some-frame * etc/NEWS: mention display-buffer-use-some-frame
-rw-r--r--doc/lispref/windows.texi17
-rw-r--r--etc/NEWS5
-rw-r--r--lisp/window.el16
3 files changed, 29 insertions, 9 deletions
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 750397c7375..41f02aabaa8 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -2301,6 +2301,23 @@ the function specified in @code{pop-up-frame-function}
2301is added to the newly created frame's parameters. 2301is added to the newly created frame's parameters.
2302@end defun 2302@end defun
2303 2303
2304@defun display-buffer-use-some-frame buffer alist
2305This function tries to ``display'' @var{buffer} by trying to find a
2306frame that meets a predicate (by default any frame other than the
2307current frame).
2308
2309If @var{alist} has a non-@code{nil} @code{`inhibit-switch-frame} entry,
2310avoid raising the frame.
2311
2312If @var{alist} has a non-nil @code{frame-predicate} entry, its value is a
2313function taking one argument (a frame), returning non-nil if the
2314frame is a candidate; this function replaces the default predicate.
2315
2316If this function chooses a window on another frame, it makes that frame
2317visible and, unless @var{alist} contains an @code{inhibit-switch-frame}
2318entry (@pxref{Choosing Window Options}), raises that frame if necessary.
2319@end defun
2320
2304@defun display-buffer-pop-up-window buffer alist 2321@defun display-buffer-pop-up-window buffer alist
2305This function tries to display @var{buffer} by splitting the largest 2322This function tries to display @var{buffer} by splitting the largest
2306or least recently-used window (typically one on the selected frame). 2323or least recently-used window (typically one on the selected frame).
diff --git a/etc/NEWS b/etc/NEWS
index 5bb7a009e37..6dbe6b38b11 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -84,6 +84,11 @@ command line when `initial-buffer-choice' is non-nil.
84 84
85* Changes in Emacs 25.1 85* Changes in Emacs 25.1
86 86
87** New display-buffer action function display-buffer-use-some-frame
88This displays the buffer in an existing frame other than the current
89frame, and allows the caller to specify a frame predicate to exclude
90frames.
91
87** New doc command `describe-symbol'. Works for functions, vars, faces, etc... 92** New doc command `describe-symbol'. Works for functions, vars, faces, etc...
88 93
89** `isearch' and `query-replace' now perform character folding in matches. 94** `isearch' and `query-replace' now perform character folding in matches.
diff --git a/lisp/window.el b/lisp/window.el
index 986c55380d0..238e53ca76a 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -6489,19 +6489,17 @@ its documentation for additional customization information."
6489;;; `display-buffer' action functions: 6489;;; `display-buffer' action functions:
6490 6490
6491(defun display-buffer-use-some-frame (buffer alist) 6491(defun display-buffer-use-some-frame (buffer alist)
6492 "Display BUFFER in an existing frame other than the current frame. 6492 "Display BUFFER in an existing frame that meets a predicate
6493If successful, return the window used; otherwise return nil. 6493(by default any frame other than the current frame). If
6494successful, return the window used; otherwise return nil.
6494 6495
6495If ALIST has a non-nil `inhibit-switch-frame' entry, avoid 6496If ALIST has a non-nil `inhibit-switch-frame' entry, avoid
6496raising the frame. 6497raising the frame.
6497 6498
6498If ALIST has a non-nil `pop-up-frame-parameters' entry, the 6499If ALIST has a non-nil `frame-predicate' entry, its value is a
6499corresponding value is an alist of frame parameters to give the 6500function taking one argument (a frame), returning non-nil if the
6500new frame. 6501frame is a candidate; this function replaces the default
6501 6502predicate."
6502If ALIST has a non-nil `frame-predicate' entry, the corresponding
6503value is a function taking one argument (a frame), returning
6504non-nil if the frame is a candidate."
6505 (let* ((predicate (or (cdr (assoc 'frame-predicate alist)) 6503 (let* ((predicate (or (cdr (assoc 'frame-predicate alist))
6506 (lambda (frame) 6504 (lambda (frame)
6507 (and 6505 (and