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