[Emacs-diffs] /srv/bzr/emacs/trunk r106263: Remove unused variable temp-buffer-show-specifiers.

[martin rudalics]

------------------------------------------------------------
revno: 106263
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Tue 2011-11-01 17:21:41 +0100
message:
  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.
modified:
  lisp/ChangeLog
  lisp/help.el
  src/ChangeLog
  src/window.c

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-10-31 10:53:16 +0000
+++ b/lisp/ChangeLog    2011-11-01 16:21:41 +0000
@@ -1,3 +1,8 @@
+2011-11-01  Martin Rudalics  <address@hidden>
+
+       * help.el (with-help-window): Don't reference
+       temp-buffer-show-specifiers in doc-string.
+
 2011-10-31  Andreas Schwab  <address@hidden>
 
        * subr.el (keymap--menu-item-with-binding): Ignore item if not a

=== modified file 'lisp/help.el'
--- a/lisp/help.el      2011-10-30 08:29:56 +0000
+++ b/lisp/help.el      2011-11-01 16:21:41 +0000
@@ -1125,10 +1125,7 @@
 (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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-10-30 18:07:48 +0000
+++ b/src/ChangeLog     2011-11-01 16:21:41 +0000
@@ -1,3 +1,9 @@
+2011-11-01  Martin Rudalics  <address@hidden>
+
+       * 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  <address@hidden>
 
        * xdisp.c (try_cursor_movement): Make sure ROW isn't decremented

=== modified file 'src/window.c'
--- a/src/window.c      2011-10-28 14:34:06 +0000
+++ b/src/window.c      2011-11-01 16:21:41 +0000
@@ -3185,10 +3185,7 @@
     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 @@
 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;