Mercurial > emacs

changeset 16738:9372cff55355

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(try_window): Add error check for POS. (prepare_menu_bars, update_menu_bar): Call Fmatch_data with new explicit arguments.
author Richard M. Stallman <rms@gnu.org>
date Fri, 20 Dec 1996 18:14:47 +0000
parents f93f805e86da
children 41dc4644dec9
files src/xdisp.c
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;