Mercurial > emacs

changeset 48589:aeab96b90326

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(start_display): Check more intelligently for whether the line is continued. (move_it_vertically_backward): Clear it->continuation_lines_width.
author Richard M. Stallman <rms@gnu.org>
date Fri, 29 Nov 2002 16:19:26 +0000
parents 52d99cc2e9e3
children 8da2e1b64deb
files src/xdisp.c
diffstat 1 files changed, 13 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/xdisp.c	Fri Nov 29 15:57:52 2002 +0000
+++ b/src/xdisp.c	Fri Nov 29 16:19:26 2002 +0000
@@ -1791,16 +1791,27 @@
 			     || FETCH_BYTE (BYTEPOS (pos) - 1) == '\n');
       if (!start_at_line_beg_p)
 	{
+	  int new_x;
+
 	  reseat_at_previous_visible_line_start (it);
 	  move_it_to (it, CHARPOS (pos), -1, -1, -1, MOVE_TO_POS);
 
+	  new_x = it->current_x + it->pixel_width;
+
 	  /* If lines are continued, this line may end in the middle
 	     of a multi-glyph character (e.g. a control character
 	     displayed as \003, or in the middle of an overlay
 	     string).  In this case move_it_to above will not have
 	     taken us to the start of the continuation line but to the
 	     end of the continued line.  */
-	  if (it->current_x > 0)
+	  if (it->current_x > 0
+	      && !it->truncate_lines_p /* Lines are continued.  */
+	      && (/* And glyph doesn't fit on the line.  */
+		  new_x > it->last_visible_x
+		  /* Or it fits exactly and we're on a window
+		     system frame.  */
+		  || (new_x == it->last_visible_x
+		      && FRAME_WINDOW_P (it->f))))
 	    {
 	      if (it->current.dpvec_index >= 0
 		  || it->current.overlay_string_index >= 0)
@@ -5407,6 +5418,7 @@
 
   /* We are now surely at a line start.  */
   it->current_x = it->hpos = 0;
+  it->continuation_lines_width = 0;
 
   /* Move forward and see what y-distance we moved.  First move to the
      start of the next line so that we get its height.  We need this