Remove an incorrect assertion on move_it_by_lines.

 src/xdisp.c (move_it_by_lines): Remove the assertion that
 "it->current_x == 0 && it->hpos == 0" which can be legitimately
 violated when there's a before-string at the beginning of a line.
 (Bug#11063)

diff --git a/src/ChangeLog b/src/ChangeLog
index 189a7e4e775e203dfd0fb77ec3f6130549a52b2a..68f311d8643857a79b592bc5db2ddc83022c28dc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -4,6 +4,10 @@
        string comes from a `display' text property, use the buffer
        position of that property as if we actually saw that position in
        the row's glyphs.
+       (move_it_by_lines): Remove the assertion that
+       "it->current_x == 0 && it->hpos == 0" which can be legitimately
+       violated when there's a before-string at the beginning of a line.
+       (Bug#11063)
 
 2012-03-30  Eli Zaretskii  <eliz@gnu.org>
 

diff --git a/src/xdisp.c b/src/xdisp.c
index 302a09dd9740121bcd39fd0dfbb303c2b9f14051..54379a2e99f85b585f9911752af463da01ed7f53 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -8966,7 +8966,6 @@ move_it_by_lines (struct it *it, int dvpos)
     {
       /* DVPOS == 0 means move to the start of the screen line.  */
       move_it_vertically_backward (it, 0);
-      xassert (it->current_x == 0 && it->hpos == 0);
       /* Let next call to line_bottom_y calculate real line height */
       last_height = 0;
     }