diff options
author | Eli Zaretskii <eliz@gnu.org> | 2012-03-31 20:08:38 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2012-03-31 20:08:38 +0300 |
commit | 697ba24bbf1bafb9677038037aeefdd97bc33b71 (patch) | |
tree | 8770098bbbd111edac1333be88f906f37624e2f5 | |
parent | 50fe197c68163a0c4a36ef5c6c820f57b061591d (diff) | |
download | emacs-697ba24bbf1bafb9677038037aeefdd97bc33b71.tar.gz |
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)
-rw-r--r-- | src/ChangeLog | 4 | ||||
-rw-r--r-- | src/xdisp.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 189a7e4e775..68f311d8643 100644 --- 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 302a09dd974..54379a2e99f 100644 --- 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; } |