# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1090883808 0
# Node ID a98f5bbbf5bc9429841ca496a6f84616bbcc504e
# Parent  371bf470dbbf8d8bc1282a37ed562d394c012e0b
(move_it_in_display_line_to): Check BUFFER_POS_REACHED_P after
we have ensured that the glyph fits on the current line (or returned
MOVE_LINE_CONTINUED otherwise).

diff -r 371bf470dbbf -r a98f5bbbf5bc src/xdisp.c
--- a/src/xdisp.c	Mon Jul 26 23:16:23 2004 +0000
+++ b/src/xdisp.c	Mon Jul 26 23:16:48 2004 +0000
@@ -5649,9 +5649,13 @@
     {
       int x, i, ascent = 0, descent = 0;
 
-      /* Stop when ZV or TO_CHARPOS reached.  */
+      /* Stop when ZV reached.
+         We used to stop here when TO_CHARPOS reached as well, but that is
+         too soon if this glyph does not fit on this line.  So we handle it
+         explicitly below.  */
       if (!get_next_display_element (it)
-	  || BUFFER_POS_REACHED_P ())
+	  || (it->truncate_lines_p
+	      && BUFFER_POS_REACHED_P ()))
 	{
 	  result = MOVE_POS_MATCH_OR_ZV;
 	  break;
@@ -5711,6 +5715,8 @@
 	      /* We want to leave anything reaching TO_X to the caller.  */
 	      if ((op & MOVE_TO_X) && new_x > to_x)
 		{
+		  if (BUFFER_POS_REACHED_P ())
+		    goto buffer_pos_reached;
 		  it->current_x = x;
 		  result = MOVE_X_REACHED;
 		  break;
@@ -5772,6 +5778,8 @@
 		  result = MOVE_LINE_CONTINUED;
 		  break;
 		}
+	      else if (BUFFER_POS_REACHED_P ())
+		goto buffer_pos_reached;
 	      else if (new_x > it->first_visible_x)
 		{
 		  /* Glyph is visible.  Increment number of glyphs that
@@ -5788,6 +5796,15 @@
 	  if (result != MOVE_UNDEFINED)
 	    break;
 	}
+      else if (BUFFER_POS_REACHED_P ())
+	{
+	buffer_pos_reached:
+	  it->current_x = x;
+	  it->max_ascent = ascent;
+	  it->max_descent = descent;
+	  result = MOVE_POS_MATCH_OR_ZV;
+	  break;
+	}
       else if ((op & MOVE_TO_X) && it->current_x >= to_x)
 	{
 	  /* Stop when TO_X specified and reached.  This check is