diff options
| author | Eli Zaretskii | 2012-03-31 20:08:38 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2012-03-31 20:08:38 +0300 |
| commit | 697ba24bbf1bafb9677038037aeefdd97bc33b71 (patch) | |
| tree | 8770098bbbd111edac1333be88f906f37624e2f5 /src | |
| parent | 50fe197c68163a0c4a36ef5c6c820f57b061591d (diff) | |
| download | emacs-697ba24bbf1bafb9677038037aeefdd97bc33b71.tar.gz emacs-697ba24bbf1bafb9677038037aeefdd97bc33b71.zip | |
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)
Diffstat (limited to 'src')
| -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 @@ | |||
| 4 | string comes from a `display' text property, use the buffer | 4 | string comes from a `display' text property, use the buffer |
| 5 | position of that property as if we actually saw that position in | 5 | position of that property as if we actually saw that position in |
| 6 | the row's glyphs. | 6 | the row's glyphs. |
| 7 | (move_it_by_lines): Remove the assertion that | ||
| 8 | "it->current_x == 0 && it->hpos == 0" which can be legitimately | ||
| 9 | violated when there's a before-string at the beginning of a line. | ||
| 10 | (Bug#11063) | ||
| 7 | 11 | ||
| 8 | 2012-03-30 Eli Zaretskii <eliz@gnu.org> | 12 | 2012-03-30 Eli Zaretskii <eliz@gnu.org> |
| 9 | 13 | ||
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) | |||
| 8966 | { | 8966 | { |
| 8967 | /* DVPOS == 0 means move to the start of the screen line. */ | 8967 | /* DVPOS == 0 means move to the start of the screen line. */ |
| 8968 | move_it_vertically_backward (it, 0); | 8968 | move_it_vertically_backward (it, 0); |
| 8969 | xassert (it->current_x == 0 && it->hpos == 0); | ||
| 8970 | /* Let next call to line_bottom_y calculate real line height */ | 8969 | /* Let next call to line_bottom_y calculate real line height */ |
| 8971 | last_height = 0; | 8970 | last_height = 0; |
| 8972 | } | 8971 | } |