Mercurial > emacs
comparison src/xdisp.c @ 107881:6effcd2bae9f
Fix bug #5943: C-e in a truncated line doesn't auto-hscroll.
xdisp.c (set_cursor_from_row): Don't consider possibility of
other rows with cursor unless they are different from this row and
this row is part of a continued line.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Fri, 16 Apr 2010 23:37:59 +0300 |
parents | 93782019c88c |
children | 1da056389889 |
comparison
equal
deleted
inserted
replaced
107880:43aef96c6073 | 107881:6effcd2bae9f |
---|---|
12923 | 12923 |
12924 /* ROW could be part of a continued line, which might have other | 12924 /* ROW could be part of a continued line, which might have other |
12925 rows whose start and end charpos occlude point. Only set | 12925 rows whose start and end charpos occlude point. Only set |
12926 w->cursor if we found a better approximation to the cursor | 12926 w->cursor if we found a better approximation to the cursor |
12927 position than we have from previously examined rows. */ | 12927 position than we have from previously examined rows. */ |
12928 if (w->cursor.vpos >= 0 | 12928 if (/* we already have a candidate row */ |
12929 w->cursor.vpos >= 0 | |
12930 /* that candidate is not the row we are processing */ | |
12931 && MATRIX_ROW (matrix, w->cursor.vpos) != row | |
12932 /* this row is part of a continued line */ | |
12933 && (row->continued_p || row->continuation_lines_width) | |
12929 /* Make sure cursor.vpos specifies a row whose start and end | 12934 /* Make sure cursor.vpos specifies a row whose start and end |
12930 charpos occlude point. This is because some callers of this | 12935 charpos occlude point. This is because some callers of this |
12931 function leave cursor.vpos at the row where the cursor was | 12936 function leave cursor.vpos at the row where the cursor was |
12932 displayed during the last redisplay cycle. */ | 12937 displayed during the last redisplay cycle. */ |
12933 && MATRIX_ROW_START_CHARPOS (MATRIX_ROW (matrix, w->cursor.vpos)) <= pt_old | 12938 && MATRIX_ROW_START_CHARPOS (MATRIX_ROW (matrix, w->cursor.vpos)) <= pt_old |