aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/window.c b/src/window.c
index e6840a0ebe7..056da1512da 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3187,10 +3187,7 @@ temp_output_buffer_show (register Lisp_Object buf)
3187 call1 (Vtemp_buffer_show_function, buf); 3187 call1 (Vtemp_buffer_show_function, buf);
3188 else 3188 else
3189 { 3189 {
3190 window = display_buffer (buf, Vtemp_buffer_show_specifiers, Qnil); 3190 window = display_buffer (buf, Qnil, Qnil);
3191 /* Reset Vtemp_buffer_show_specifiers immediately so it won't
3192 affect subsequent calls. */
3193 Vtemp_buffer_show_specifiers = Qnil;
3194 3191
3195 if (!EQ (XWINDOW (window)->frame, selected_frame)) 3192 if (!EQ (XWINDOW (window)->frame, selected_frame))
3196 Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window))); 3193 Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window)));
@@ -6465,16 +6462,6 @@ If this function is used, then it must do the entire job of showing
6465the buffer; `temp-buffer-show-hook' is not run unless this function runs it. */); 6462the buffer; `temp-buffer-show-hook' is not run unless this function runs it. */);
6466 Vtemp_buffer_show_function = Qnil; 6463 Vtemp_buffer_show_function = Qnil;
6467 6464
6468 DEFVAR_LISP ("temp-buffer-show-specifiers", Vtemp_buffer_show_specifiers,
6469 doc: /* Buffer display specifiers used by `with-output-to-temp-buffer'.
6470These specifiers are passed by `with-output-to-temp-buffer' as second
6471argument to `display-buffer'. Applications should only let-bind this
6472around a call to `with-output-to-temp-buffer'.
6473
6474For a description of buffer display specifiers see the variable
6475`display-buffer-alist'. */);
6476 Vtemp_buffer_show_specifiers = Qnil;
6477
6478 DEFVAR_LISP ("minibuffer-scroll-window", Vminibuf_scroll_window, 6465 DEFVAR_LISP ("minibuffer-scroll-window", Vminibuf_scroll_window,
6479 doc: /* Non-nil means it is the window that C-M-v in minibuffer should scroll. */); 6466 doc: /* Non-nil means it is the window that C-M-v in minibuffer should scroll. */);
6480 Vminibuf_scroll_window = Qnil; 6467 Vminibuf_scroll_window = Qnil;