aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2016-10-05 16:12:19 +0200
committerMartin Rudalics2016-10-05 16:12:19 +0200
commit9adfb021df482c6aa94a043f07acf1e8eb695bf2 (patch)
tree2f41a3ae37d407f0e1f3885b30897c31d7f62082
parent0709b900f583ae2e51c0a0de507b8900d6923c1b (diff)
downloademacs-9adfb021df482c6aa94a043f07acf1e8eb695bf2.tar.gz
emacs-9adfb021df482c6aa94a043f07acf1e8eb695bf2.zip
Document return value of `display-buffer-in-side-window'
* doc/lispref/windows.texi (Displaying Buffers in Side Windows): * lisp/window.el (display-buffer-in-side-window): Describe return value of `display-buffer-in-side-window'.
-rw-r--r--doc/lispref/windows.texi5
-rw-r--r--lisp/window.el4
2 files changed, 6 insertions, 3 deletions
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 1c940dcdac0..2d340e34cd5 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -3117,7 +3117,10 @@ specified buffer.
3117 3117
3118@defun display-buffer-in-side-window buffer alist 3118@defun display-buffer-in-side-window buffer alist
3119This function displays @var{buffer} in a side window of the selected 3119This function displays @var{buffer} in a side window of the selected
3120frame. @var{alist} is an association list of symbols and values as for 3120frame. It returns the window used for displaying @var{buffer},
3121@code{nil} if no such window can be found or created.
3122
3123@var{alist} is an association list of symbols and values as for
3121@code{display-buffer}. The following symbols in @var{alist} are special 3124@code{display-buffer}. The following symbols in @var{alist} are special
3122for this function: 3125for this function:
3123 3126
diff --git a/lisp/window.el b/lisp/window.el
index 4511267149c..dea0b250a94 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -979,8 +979,8 @@ be reused and have its `window-slot' parameter value accordingly
979modified. 979modified.
980 980
981Unless `display-buffer-mark-dedicated' is non-nil, softly 981Unless `display-buffer-mark-dedicated' is non-nil, softly
982dedicate the side window used to BUFFER. Return nil if no 982dedicate the side window used to BUFFER. Return the window used
983suitable window is found. 983for displaying BUFFER, nil if no suitable window can be found.
984 984
985This function installs the `window-side' and `window-slot' 985This function installs the `window-side' and `window-slot'
986parameters and makes them persistent. It neither modifies ALIST 986parameters and makes them persistent. It neither modifies ALIST