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

Yet another fix for when point ends up in invisible text

Browse source 
* src/xdisp.c (redisplay_window): When someone forced
window-start, and honoring that failed to show the cursor, try
moving out of invisible text, before falling back to the middle of
the window.  (Bug#22098)
This commit is contained in:
Eli Zaretskii 2015-12-09 20:03:54 +02:00
parent b227422c66
commit d75849e937
1 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/xdisp.c
View file

@ -16301,9 +16301,33 @@ redisplay_window (Lisp_Object window, bool just_this_one_p)
if (w->cursor.vpos < 0)
{
/* If point does not appear, try to move point so it does
appear. The desired matrix has been built above, so we
can use it here. */
new_vpos = window_box_height (w) / 2;
appear. The desired matrix has been built above, so we
can use it here. First see if point is in invisible
text, and if so, move it to the first visible buffer
position past that. */
struct glyph_row *r = NULL;
Lisp_Object invprop =
get_char_property_and_overlay (make_number (PT), Qinvisible,
Qnil, NULL);
if (TEXT_PROP_MEANS_INVISIBLE (invprop) != 0)
{
ptrdiff_t alt_pt;
Lisp_Object invprop_end =
Fnext_single_char_property_change (make_number (PT), Qinvisible,
Qnil, Qnil);
if (NATNUMP (invprop_end))
alt_pt = XFASTINT (invprop_end);
else
alt_pt = ZV;
r = row_containing_pos (w, alt_pt, w->desired_matrix->rows,
NULL, 0);
}
if (r)
new_vpos = MATRIX_ROW_BOTTOM_Y (r);
else /* Give up and just move to the middle of the window. */
new_vpos = window_box_height (w) / 2;
}
if (!cursor_row_fully_visible_p (w, false, false))