From 4ee88440781304fc7003d51e363c3e3a5cc2e8fd Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Tue, 1 Nov 2011 17:21:41 +0100 Subject: [PATCH] Remove unused variable temp-buffer-show-specifiers. * window.c (temp_output_buffer_show): Don't use Vtemp_buffer_show_specifiers. (Vtemp_buffer_show_specifiers): Remove unused variable. * help.el (with-help-window): Don't reference temp-buffer-show-specifiers in doc-string. --- lisp/ChangeLog | 5 +++++ lisp/help.el | 5 +---- src/ChangeLog | 6 ++++++ src/window.c | 15 +-------------- 4 files changed, 13 insertions(+), 18 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 97ae0232d55..7be6e030593 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-11-01 Martin Rudalics + + * help.el (with-help-window): Don't reference + temp-buffer-show-specifiers in doc-string. + 2011-10-31 Andreas Schwab * subr.el (keymap--menu-item-with-binding): Ignore item if not a diff --git a/lisp/help.el b/lisp/help.el index bc3d863f357..506889c210e 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -1125,10 +1125,7 @@ HELP-WINDOW is the window used for displaying the help buffer." (defmacro with-help-window (buffer-name &rest body) "Display buffer with name BUFFER-NAME in a help window evaluating BODY. Select help window if the actual value of the user option -`help-window-select' says so. Return last value in BODY. - -You can specify where and how to show the buffer by binding the -variable `temp-buffer-show-specifiers' to an appropriate value." +`help-window-select' says so. Return last value in BODY." (declare (indent 1) (debug t)) `(progn ;; Make `help-window-point-marker' point nowhere. The only place diff --git a/src/ChangeLog b/src/ChangeLog index 0bb16514b58..37635555a0f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2011-11-01 Martin Rudalics + + * window.c (temp_output_buffer_show): Don't use + Vtemp_buffer_show_specifiers. + (Vtemp_buffer_show_specifiers): Remove unused variable. + 2011-10-30 Eli Zaretskii * xdisp.c (try_cursor_movement): Make sure ROW isn't decremented diff --git a/src/window.c b/src/window.c index 38f16c91f34..422073b1bd3 100644 --- a/src/window.c +++ b/src/window.c @@ -3185,10 +3185,7 @@ temp_output_buffer_show (register Lisp_Object buf) call1 (Vtemp_buffer_show_function, buf); else { - window = display_buffer (buf, Vtemp_buffer_show_specifiers, Qnil); - /* Reset Vtemp_buffer_show_specifiers immediately so it won't - affect subsequent calls. */ - Vtemp_buffer_show_specifiers = Qnil; + window = display_buffer (buf, Qnil, Qnil); if (!EQ (XWINDOW (window)->frame, selected_frame)) Fmake_frame_visible (WINDOW_FRAME (XWINDOW (window))); @@ -6460,16 +6457,6 @@ If this function is used, then it must do the entire job of showing the buffer; `temp-buffer-show-hook' is not run unless this function runs it. */); Vtemp_buffer_show_function = Qnil; - DEFVAR_LISP ("temp-buffer-show-specifiers", Vtemp_buffer_show_specifiers, - doc: /* Buffer display specifiers used by `with-output-to-temp-buffer'. -These specifiers are passed by `with-output-to-temp-buffer' as second -argument to `display-buffer'. Applications should only let-bind this -around a call to `with-output-to-temp-buffer'. - -For a description of buffer display specifiers see the variable -`display-buffer-alist'. */); - Vtemp_buffer_show_specifiers = Qnil; - DEFVAR_LISP ("minibuffer-scroll-window", Vminibuf_scroll_window, doc: /* Non-nil means it is the window that C-M-v in minibuffer should scroll. */); Vminibuf_scroll_window = Qnil; -- 2.39.2