# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 851105687 0
# Node ID 9372cff553556d7ede92511fbc89538625a76154
# Parent  f93f805e86dae1abbc13254b788725fb6be05de9
(try_window): Add error check for POS.

(prepare_menu_bars, update_menu_bar):
Call Fmatch_data with new explicit arguments.

diff -r f93f805e86da -r 9372cff55355 src/xdisp.c
--- a/src/xdisp.c	Fri Dec 20 05:58:41 1996 +0000
+++ b/src/xdisp.c	Fri Dec 20 18:14:47 1996 +0000
@@ -775,7 +775,7 @@
       Lisp_Object tail, frame;
       int count = specpdl_ptr - specpdl;
 
-      record_unwind_protect (Fstore_match_data, Fmatch_data ());
+      record_unwind_protect (Fstore_match_data, Fmatch_data (Qnil, Qnil));
 
       FOR_EACH_FRAME (tail, frame)
 	{
@@ -1396,7 +1396,7 @@
 
 	  set_buffer_internal_1 (XBUFFER (w->buffer));
 	  if (save_match_data)
-	    record_unwind_protect (Fstore_match_data, Fmatch_data ());
+	    record_unwind_protect (Fstore_match_data, Fmatch_data (Qnil, Qnil));
 	  if (NILP (Voverriding_local_map_menu_flag))
 	    {
 	      specbind (Qoverriding_terminal_local_map, Qnil);
@@ -2048,6 +2048,11 @@
   int width = window_internal_width (w) - 1;
   struct position val;
 
+  /* POS should never be out of range!  */
+  if (pos < XBUFFER (w->buffer)->begv
+      || pos > XBUFFER (w->buffer)->zv)
+    abort ();
+
   Fset_marker (w->start, make_number (pos), Qnil);
   cursor_vpos = -1;
   overlay_arrow_seen = 0;