mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-10 21:50:37 -08:00
Code Issues Projects Releases Wiki Activity

(row_containing_pos): Check more carefully

Browse source 
whether charpos is really in the row before returning it.
This commit is contained in:
Richard M. Stallman 2002-12-09 01:56:05 +00:00
parent eca79530b7
commit 5cce13ddd7
1 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/xdisp.c
View file

@ -11509,25 +11509,27 @@ row_containing_pos (w, charpos, start, end, dy)
last_y = window_text_bottom_y (w) - dy;
while ((end == NULL || row < end)
&& MATRIX_ROW_BOTTOM_Y (row) < last_y
&& (MATRIX_ROW_END_CHARPOS (row) < charpos
while (1)
{
/* Give up if we have gone too far. */
if (end && row >= end)
return NULL;
if (MATRIX_ROW_BOTTOM_Y (row) >= last_y)
return NULL;
/* If it is in this row, return this row. */
if (! (MATRIX_ROW_END_CHARPOS (row) < charpos
|| (MATRIX_ROW_END_CHARPOS (row) == charpos
/* The end position of a row equals the start
position of the next row. If CHARPOS is there, we
would rather display it in the next line, except
when this line ends in ZV. */
&& !row->ends_at_zv_p
&& !MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row))))
++row;
/* Give up if CHARPOS not found. */
if ((end && row >= end)
|| charpos < MATRIX_ROW_START_CHARPOS (row)
|| charpos > MATRIX_ROW_END_CHARPOS (row))
row = NULL;
return row;
&& !MATRIX_ROW_ENDS_IN_MIDDLE_OF_CHAR_P (row)))
&& charpos >= MATRIX_ROW_START_CHARPOS (row))
return row;
++row;
}
}