procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug #11094 with cursor display on display string after invisible text.

Browse source 
src/xdisp.c (set_cursor_from_row): If the display string appears in
 the buffer at position that is closer to point than the position
 after the display string, display the cursor on the first glyph of
 the display string.  Fixes cursor display when a 'display' text
 property immediately follows invisible text.
This commit is contained in:
Eli Zaretskii 2012-04-09 11:00:08 +03:00
parent e5fcdb5e92
commit 70f4d9736b
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ChangeLog
View file

@ -1,3 +1,11 @@
2012-04-09 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (set_cursor_from_row): If the display string appears in
the buffer at position that is closer to point than the position
after the display string, display the cursor on the first glyph of
the display string. Fixes cursor display when a 'display' text
property immediately follows invisible text. (Bug#11094)
2012-04-09 Paul Eggert <eggert@cs.ucla.edu>
composite.c: use 'double' consistently

16
src/xdisp.c
View file

@ -14042,15 +14042,18 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
|| pos <= tem)
{
/* If the string from which this glyph came is
found in the buffer at point, then we've
found the glyph we've been looking for. If
it comes from an overlay (tem == 0), and it
has the `cursor' property on one of its
found in the buffer at point, or at position
that is closer to point than pos_after, then
we've found the glyph we've been looking for.
If it comes from an overlay (tem == 0), and
it has the `cursor' property on one of its
glyphs, record that glyph as a candidate for
displaying the cursor. (As in the
unidirectional version, we will display the
cursor on the last candidate we find.) */
if (tem == 0 || tem == pt_old)
if (tem == 0
|| tem == pt_old
|| (tem - pt_old > 0 && tem < pos_after))
{
/* The glyphs from this string could have
been reordered. Find the one with the
@ -14088,7 +14091,8 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
}
}
if (tem == pt_old)
if (tem == pt_old
|| (tem - pt_old > 0 && tem < pos_after))
goto compute_x;
}
if (tem)