aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/window.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/window.el')
-rw-r--r--lisp/window.el25
1 files changed, 12 insertions, 13 deletions
diff --git a/lisp/window.el b/lisp/window.el
index 9ac3a4ecda0..486bb166fc1 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -147,12 +147,12 @@ to `display-buffer'."
147BUFFER-OR-NAME must specify either a live buffer, or the name of a 147BUFFER-OR-NAME must specify either a live buffer, or the name of a
148buffer (if it does not exist, this macro creates it). 148buffer (if it does not exist, this macro creates it).
149 149
150Make sure the specified buffer is empty before evaluating BODY. 150This first empties the specified buffer. It does not make the
151Do not make that buffer current for BODY. Instead, bind 151buffer current, but rather binds `standard-output', so that
152`standard-output' to that buffer, so that output generated with 152output generated with `prin1' and similar functions in BODY goes
153`prin1' and similar functions in BODY goes into that buffer. 153into the buffer.
154 154
155After evaluating BODY, this marks the specified buffer unmodified and 155After evaluating BODY, it marks the specified buffer unmodified and
156read-only, and displays it in a window via `display-buffer', passing 156read-only, and displays it in a window via `display-buffer', passing
157ACTION as the action argument to `display-buffer'. It automatically 157ACTION as the action argument to `display-buffer'. It automatically
158shrinks the relevant window if `temp-buffer-resize-mode' is enabled. 158shrinks the relevant window if `temp-buffer-resize-mode' is enabled.
@@ -162,21 +162,20 @@ a function. In that case, runs the function with two arguments -
162the window showing the specified buffer and the value returned by 162the window showing the specified buffer and the value returned by
163BODY - and returns the value returned by that function. 163BODY - and returns the value returned by that function.
164 164
165Since this macro calls `display-buffer', the window displaying
166the buffer is usually not selected and the specified buffer
167usually not made current. QUIT-FUNCTION can override that.
165If the buffer is displayed on a new frame, the window manager may 168If the buffer is displayed on a new frame, the window manager may
166decide to select that frame. In that case, it's usually a good 169decide to select that frame. In that case, it's usually a good
167strategy if the function specified by QUIT-FUNCTION selects the 170strategy if QUIT-FUNCTION selects the window showing the buffer
168window showing the buffer before reading a value from the 171before reading any value from the minibuffer; for example, when
169minibuffer; for example, when asking a `yes-or-no-p' question. 172asking a `yes-or-no-p' question.
170 173
171This construct is similar to `with-output-to-temp-buffer', but does 174This construct is similar to `with-output-to-temp-buffer', but does
172not put the buffer in help mode, or call `temp-buffer-show-function'. 175not put the buffer in help mode, or call `temp-buffer-show-function'.
173It also runs different hooks, namely `temp-buffer-window-setup-hook' 176It also runs different hooks, namely `temp-buffer-window-setup-hook'
174\(with the specified buffer current) and `temp-buffer-window-show-hook' 177\(with the specified buffer current) and `temp-buffer-window-show-hook'
175\(with the specified buffer current and the window showing it selected). 178\(with the specified buffer current and the window showing it selected)."
176
177Since this macro calls `display-buffer', the window displaying
178the buffer is usually not selected and the specified buffer
179usually not made current. QUIT-FUNCTION can override that."
180 (declare (debug t)) 179 (declare (debug t))
181 (let ((buffer (make-symbol "buffer")) 180 (let ((buffer (make-symbol "buffer"))
182 (window (make-symbol "window")) 181 (window (make-symbol "window"))