Merge from trunk.

3 files changed, 25 insertions, 37 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 007a73f7988..65f1c086260 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,10 +1,23 @@
+2012-10-18  Daniel Colascione  <dancol@dancol.org>
+
+        * alloc.c (NSTATICS): Increase from 0x650 to 0x1000
+        (staticpro): If we run out of staticpro slots, die with an
+        informative error instead of just calling emacs_abort.
+
+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/alloc.c b/src/alloc.c
index f2dd7c8cee7..08dc26784cc 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -376,7 +376,7 @@ struct gcpro *gcprolist;
 /* Addresses of staticpro'd variables.  Initialize it to a nonzero
    value; otherwise some compilers put it into BSS.  */
 
-#define NSTATICS 0x660
+#define NSTATICS 0x1000
 static Lisp_Object *staticvec[NSTATICS] = {&Vpurify_flag};
 
 /* Index of next unused slot in staticvec.  */
@@ -5030,7 +5030,7 @@ staticpro (Lisp_Object *varaddress)
 {
   staticvec[staticidx++] = varaddress;
   if (staticidx >= NSTATICS)
-    emacs_abort ();
+    fatal ("NSTATICS too small. Try increasing and recompiling Emacs.");
 }
 
 
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);