From: Martin Rudalics <rudalics@gmx.at>
Date: Thu, 18 Oct 2012 08:27:49 +0000 (+0200)
Subject: In window.c fix two flaws reported by Dmitry Antipov.
X-Git-Tag: emacs-24.2.90~227
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1f76f6f5798b2f9ce8c9bdfbe85b198b8d02d924;p=emacs.git

In window.c fix two flaws reported by Dmitry Antipov.

* window.c (Ftemp_output_buffer_show): Remove.
(Fwindow_vscroll, Fset_window_vscroll): Use decode_live_window.
(syms_of_window): Remove defsubr for Stemp_output_buffer_show.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 827850e332d..817274b5691 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,10 +1,17 @@
+2012-10-18  Martin Rudalics  <rudalics@gmx.at>
+
+	Fix two flaws reported by Dmitry Antipov.
+	* window.c (Ftemp_output_buffer_show): Remove.
+	(Fwindow_vscroll, Fset_window_vscroll): Use decode_live_window.
+	(syms_of_window): Remove defsubr for Stemp_output_buffer_show.
+
 2012-10-17  Eli Zaretskii  <eliz@gnu.org>
 
-	* makefile.w32-in ($(BLD)/w32.$(O)): 
-	($(BLD)/vm-limit.$(O)): 
-	($(BLD)/term.$(O)): 
-	($(BLD)/unexw32.$(O)): 
-	($(BLD)/fileio.$(O)): 
+	* makefile.w32-in ($(BLD)/w32.$(O)):
+	($(BLD)/vm-limit.$(O)):
+	($(BLD)/term.$(O)):
+	($(BLD)/unexw32.$(O)):
+	($(BLD)/fileio.$(O)):
 	($(BLD)/dispnew.$(O)): Update dependencies.
 
 	* w32term.h (w32_initialize_display_info, initialize_w32_display):
diff --git a/src/window.c b/src/window.c
index b4fee61cac8..dfcabda59b9 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3339,7 +3339,7 @@ displaying that buffer.  */)
   return Qnil;
 }
 
-
+/* Obsolete since 24.3.  */
 void
 temp_output_buffer_show (register Lisp_Object buf)
 {
@@ -3392,16 +3392,6 @@ temp_output_buffer_show (register Lisp_Object buf)
       }
     }
 }
-
-DEFUN ("internal-temp-output-buffer-show",
-       Ftemp_output_buffer_show, Stemp_output_buffer_show,
-       1, 1, 0,
-       doc: /* Internal function for `with-output-to-temp-buffer'.  */)
-     (Lisp_Object buf)
-{
-  temp_output_buffer_show (buf);
-  return Qnil;
-}
 
 /* Make new window, have it replace WINDOW in window-tree, and make
    WINDOW its only vertical child (HORFLAG 1 means make WINDOW its only
@@ -6423,15 +6413,8 @@ optional second arg PIXELS-P means value is measured in pixels.  */)
   (Lisp_Object window, Lisp_Object pixels_p)
 {
   Lisp_Object result;
-  struct frame *f;
-  struct window *w;
-
-  if (NILP (window))
-    window = selected_window;
-  else
-    CHECK_WINDOW (window);
-  w = XWINDOW (window);
-  f = XFRAME (w->frame);
+  struct window *w = decode_live_window (window);
+  struct frame *f = XFRAME (w->frame);
 
   if (FRAME_WINDOW_P (f))
     result = (NILP (pixels_p)
@@ -6455,18 +6438,11 @@ result of this rounding.
 If PIXELS-P is non-nil, the return value is VSCROLL.  */)
   (Lisp_Object window, Lisp_Object vscroll, Lisp_Object pixels_p)
 {
-  struct window *w;
-  struct frame *f;
+  struct window *w = decode_live_window (window);
+  struct frame *f = XFRAME (w->frame);
 
-  if (NILP (window))
-    window = selected_window;
-  else
-    CHECK_WINDOW (window);
   CHECK_NUMBER_OR_FLOAT (vscroll);
 
-  w = XWINDOW (window);
-  f = XFRAME (w->frame);
-
   if (FRAME_WINDOW_P (f))
     {
       int old_dy = w->vscroll;
@@ -6923,7 +6899,6 @@ respectively are not installed by `window-state-put'.  */);
   defsubr (&Srun_window_configuration_change_hook);
   defsubr (&Sselect_window);
   defsubr (&Sforce_window_update);
-  defsubr (&Stemp_output_buffer_show);
   defsubr (&Ssplit_window_internal);
   defsubr (&Sscroll_up);
   defsubr (&Sscroll_down);