Mercurial > emacs
comparison src/xdisp.c @ 34743:c105f9abf6b5
(try_cursor_movement): Fix last change. The real
condition is that PT is at the end of the row, and should
be displayed at the start of the next row.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Wed, 20 Dec 2000 14:24:47 +0000 |
parents | 84f309395a36 |
children | e978a3fb2690 |
comparison
equal
deleted
inserted
replaced
34742:b7aea0676128 | 34743:c105f9abf6b5 |
---|---|
9330 /* if PT is not in the glyph row, give up. */ | 9330 /* if PT is not in the glyph row, give up. */ |
9331 rc = -1; | 9331 rc = -1; |
9332 } | 9332 } |
9333 else if (MATRIX_ROW_PARTIALLY_VISIBLE_P (row)) | 9333 else if (MATRIX_ROW_PARTIALLY_VISIBLE_P (row)) |
9334 { | 9334 { |
9335 /* If we end up in a partially visible line, let's make it | 9335 if (PT == MATRIX_ROW_END_CHARPOS (row) |
9336 fully visible, except when it's taller than the window, | 9336 && !row->ends_at_zv_p |
9337 in which case we can't do much about it. */ | 9337 && !MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row)) |
9338 if (scroll_p) | |
9339 rc = -1; | 9338 rc = -1; |
9340 else if (row->height > window_box_height (w)) | 9339 else if (row->height > window_box_height (w)) |
9341 { | 9340 { |
9341 /* If we end up in a partially visible line, let's | |
9342 make it fully visible, except when it's taller | |
9343 than the window, in which case we can't do much | |
9344 about it. */ | |
9342 *scroll_step = 1; | 9345 *scroll_step = 1; |
9343 rc = -1; | 9346 rc = -1; |
9344 } | 9347 } |
9345 else | 9348 else |
9346 { | 9349 { |