# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 985321469 0
# Node ID 88b92b2228467e41d89c9a0d70058b65395f0f3e
# Parent  fabff5d240fb7dabd381493eecd0e323dee8db93
(init_iterator): Check WINDOWP before using XWINDOW.
(string_buffer_position): Use `make_number'.

diff -r fabff5d240fb -r 88b92b222846 src/xdisp.c
--- a/src/xdisp.c	Fri Mar 23 04:24:23 2001 +0000
+++ b/src/xdisp.c	Fri Mar 23 04:24:29 2001 +0000
@@ -1524,6 +1524,7 @@
 	  /* Or show the region if we are in the mini-buffer and W is
 	     the window the mini-buffer refers to.  */
 	  || (MINI_WINDOW_P (XWINDOW (selected_window))
+	      && WINDOWP (Vminibuf_scroll_window)
 	      && w == XWINDOW (Vminibuf_scroll_window))))
     {
       int charpos = marker_position (current_buffer->mark);
@@ -3093,7 +3094,7 @@
   const int MAX_DISTANCE = 1000;
   int found = 0;
 
-  pos = around_charpos;
+  pos = make_number (around_charpos);
   limit = make_number (min (XINT (pos) + MAX_DISTANCE, ZV));
   while (!found && !EQ (pos, limit))
     {
@@ -3106,7 +3107,7 @@
 
   if (!found)
     {
-      pos = around_charpos;
+      pos = make_number (around_charpos);
       limit = make_number (max (XINT (pos) - MAX_DISTANCE, BEGV));
       while (!found && !EQ (pos, limit))
 	{