--- a/src/indent.c	Mon Aug 13 11:01:58 2007 +0200
+++ b/src/indent.c	Mon Aug 13 11:03:08 2007 +0200
@@ -573,15 +573,8 @@
   /* #### This assertion must be true before the if statements are hit
      but may possibly be wrong after the call to
      point_in_line_start_cache if orig is outside of the visible
-     region of the buffer.  Handle this.
-
-     This occurs sometimes if scroll-step is non-zero and the window
-     is very small.  In this case it's not possible to lay out any lines
-     in the window and point_in_line_start_cache returns -1 because
-     the line cache is empty.  In this case we will just return the
-     original point and hope for the best. */
-  if (elt < 0)
-    return orig;
+     region of the buffer.  Handle this. */
+  assert (elt >= 0);
 
   /* Moving downward. */
   if (vtarget > 0)
@@ -672,7 +665,7 @@
   if (NILP (window))
     window = Fselected_window (Qnil);
 
-  CHECK_LIVE_WINDOW (window);
+  CHECK_WINDOW (window);
   CHECK_INT (lines);
 
   selected = (EQ (window, Fselected_window (Qnil)));
@@ -746,7 +739,7 @@
   if (NILP (window))
     window = Fselected_window (Qnil);
 
-  CHECK_LIVE_WINDOW (window);
+  CHECK_WINDOW (window);
   w = XWINDOW (window);
 
   eobuf = BUF_ZV (XBUFFER (w->buffer));
@@ -849,7 +842,7 @@
   if (NILP (window))
     window = Fselected_window (Qnil);
 
-  CHECK_LIVE_WINDOW (window);
+  CHECK_WINDOW (window);
   CHECK_INT (pixels);
 
   selected = (EQ (window, Fselected_window (Qnil)));