# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1180048892 0
# Node ID 2d20244326ca5ba40b914fd774ccaaf9cd8ccd76
# Parent  6761dfba1031fb7170e0bf24c5245f7e07807254
(redisplay_window): If first window line is a continuation line,
recompute the new window start instead of recentering.

diff -r 6761dfba1031 -r 2d20244326ca src/xdisp.c
--- a/src/xdisp.c	Thu May 24 23:21:23 2007 +0000
+++ b/src/xdisp.c	Thu May 24 23:21:32 2007 +0000
@@ -12968,6 +12968,8 @@
 	w->force_start = Qt;
     }
 
+ force_start:
+
   /* Handle case where place to start displaying has been specified,
      unless the specified location is outside the accessible range.  */
   if (!NILP (w->force_start)
@@ -13147,39 +13149,15 @@
 	 than a simple mouse-click.  */
       if (NILP (w->start_at_line_beg)
 	  && NILP (do_mouse_tracking)
-	  && CHARPOS (startp) > BEGV)
-	{
-#if 0
-	  /* The following code tried to make BEG_UNCHANGED and
-	     END_UNCHANGED up to date (similar to try_window_id).
-	     Is it important to do so?
-
-	     The trouble is that it's a little too strict when it
-	     comes to overlays: modify_overlay can call
-	     BUF_COMPUTE_UNCHANGED, which alters BUF_BEG_UNCHANGED and
-	     BUF_END_UNCHANGED directly without moving the gap.
-
-	     This can result in spurious recentering when overlays are
-	     altered in the buffer.  So unless it's proven necessary,
-	     let's leave this commented out for now. -- cyd.  */
-	  if (MODIFF > SAVE_MODIFF
-	      || BEG_UNCHANGED + END_UNCHANGED > Z_BYTE)
-	    {
-	      if (GPT - BEG < BEG_UNCHANGED)
-		BEG_UNCHANGED = GPT - BEG;
-	      if (Z - GPT < END_UNCHANGED)
-		END_UNCHANGED = Z - GPT;
-	    }
-#endif
-
-	  if (CHARPOS (startp) > BEG + save_beg_unchanged
-	      && CHARPOS (startp) <= Z - save_end_unchanged)
-	    {
-	      /* There doesn't seems to be a simple way to find a new
-		 window start that is near the old window start, so
-		 we just recenter.  */
-	      goto recenter;
-	    }
+	  && CHARPOS (startp) > BEGV
+	  && CHARPOS (startp) > BEG + save_beg_unchanged
+	  && CHARPOS (startp) <= Z - save_end_unchanged)
+	{
+	  w->force_start = Qt;
+	  if (XMARKER (w->start)->buffer == current_buffer)
+	    compute_window_start_on_continuation_line (w);
+	  SET_TEXT_POS_FROM_MARKER (startp, w->start);
+	  goto force_start;
 	}
 
 #if GLYPH_DEBUG