Index: window.c
===================================================================
RCS file: /users/darrylo/.repository/xemacs-21.4/src/window.c,v
retrieving revision 1.1.1.2
diff -c -r1.1.1.2 window.c
*** window.c	2001/11/05 23:53:59	1.1.1.2
--- window.c	2001/11/13 19:49:53
***************
*** 2614,2620 ****
  	 We can't just wait until we hit the first window again,
  	 because it might be deleted.  */
  
!       last_window = Fprevious_window (w, mini ? Qt : Qnil, frame_arg, Qt);
  
        best_window = Qnil;
        for (;;)
--- 2614,2620 ----
  	 We can't just wait until we hit the first window again,
  	 because it might be deleted.  */
  
!       last_window = Fprevious_window (w, mini ? Qt : Qnil, frame_arg, device);
  
        best_window = Qnil;
        for (;;)
***************
*** 2629,2635 ****
  	  /* Given the outstanding quality of the rest of this code,
  	     I feel no shame about putting this piece of shit in. */
  	  if (++lose_lose >= 500)
! 	    return Qnil;
  
  	  /* Note that we do not pay attention here to whether
  	     the frame is visible, since Fnext_window skips non-visible frames
--- 2629,2635 ----
  	  /* Given the outstanding quality of the rest of this code,
  	     I feel no shame about putting this piece of shit in. */
  	  if (++lose_lose >= 500)
! 	    break;
  
  	  /* Note that we do not pay attention here to whether
  	     the frame is visible, since Fnext_window skips non-visible frames