Handle lines truncated on right.

 xdisp.c (find_row_edges): Handle the truncated_on_right_p rows.

diff --git a/src/ChangeLog b/src/ChangeLog
index d4c072b1fab879be44887759d7f11da3c7e2bb03..6cea39deb5387eb09f22e122ba78f57ff73ac4c0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
 
        * xdisp.c (find_row_edges): Handle the case of characters
        delivered from display vector.  Fix tests related to it->method.
+       Handle the truncated_on_right_p rows.
 
 2010-05-19  Eli Zaretskii  <eliz@gnu.org>
 

diff --git a/src/xdisp.c b/src/xdisp.c
index 47c4945c9dc0aab67f7ebc039594bc8dc6d55239..17558af66064d6257452b36a05f723158dbb697d 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17536,6 +17536,7 @@ find_row_edges (it, row, min_pos, min_bpos, max_pos, max_bpos)
 
      Line ends in a newline from buffer       eol_pos + 1
      Line is continued from buffer            max_pos + 1
+     Line is truncated on right               it->current.pos
      Line ends in a newline from string       max_pos
      Line is continued from string            max_pos
      Line is continued from display vector    max_pos
@@ -17570,6 +17571,11 @@ find_row_edges (it, row, min_pos, min_bpos, max_pos, max_bpos)
              SET_TEXT_POS (row->maxpos, max_pos, max_bpos);
            }
        }
+      else if (row->truncated_on_right_p)
+       /* display_line already called reseat_at_next_visible_line_start,
+          which puts the iterator at the beginning of the next line, in
+          the logical order. */
+       row->maxpos = it->current.pos;
       else if (max_pos == min_pos && it->method != GET_FROM_BUFFER)
        /* A line that is entirely from a string/image/stretch...  */
        row->maxpos = row->minpos;