--- a/src/redisplay.c	Mon Aug 13 10:25:39 2007 +0200
+++ b/src/redisplay.c	Mon Aug 13 10:26:29 2007 +0200
@@ -6259,7 +6259,7 @@
 }
 
 
-static char window_line_number_buf[16];
+static char window_line_number_buf[32];
 
 /* Efficiently determine the window line number, and return a pointer
    to its printed representation.  Do this regardless of whether
@@ -7089,10 +7089,7 @@
      fail. */
   if (startp < BUF_BEGV (b) || startp > BUF_ZV (b)
       || point < BUF_BEGV (b) || point > BUF_ZV (b))
-    {
-      w->line_cache_validation_override--;
-      return 0;
-    }
+    return 0;
 
   validate_line_start_cache (w);
   w->line_cache_validation_override++;
@@ -7278,7 +7275,10 @@
   cur_elt = point_in_line_start_cache (w, point, 0);
   /* #### See comment in update_line_start_cache about big minibuffers. */
   if (cur_elt < 0)
-    return point;
+    {
+      w->line_cache_validation_override--;
+      return point;
+    }
 
   point_line_height = Dynarr_atp (w->line_start_cache, cur_elt)->height;