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

Fix bug #11035 with cursor positioning on overlay strings with newlines.

Browse source 
src/xdisp.c (cursor_row_p): Even if the glyph row ends in a string
 that is not from display property, accept the row as a "cursor
 row" if one of the string's character has a non-nil `cursor'
 property.  Fixes cursor positioning when there are newlines in
 overlay strings, e.g. in icomplete.el.
This commit is contained in:
Eli Zaretskii 2012-03-18 18:57:39 +02:00
parent d15aac6820
commit e50a24a249
2 changed files with 31 additions and 2 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-03-18 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (cursor_row_p): Even if the glyph row ends in a string
that is not from display property, accept the row as a "cursor
row" if one of the string's character has a non-nil `cursor'
property. Fixes cursor positioning when there are newlines in
overlay strings, e.g. in icomplete.el. (Bug#11035)
2012-03-12 Paul Eggert <eggert@cs.ucla.edu>
* buffer.c (compare_overlays): Don't assume args differ (Bug#6830).

25
src/xdisp.c
View file

@ -18456,9 +18456,11 @@ cursor_row_p (struct glyph_row *row)
/* Suppose the row ends on a string.
Unless the row is continued, that means it ends on a newline
in the string. If it's anything other than a display string
(e.g. a before-string from an overlay), we don't want the
(e.g., a before-string from an overlay), we don't want the
cursor there. (This heuristic seems to give the optimal
behavior for the various types of multi-line strings.) */
behavior for the various types of multi-line strings.)
One exception: if the string has `cursor' property on one of
its characters, we _do_ want the cursor there. */
if (CHARPOS (row->end.string_pos) >= 0)
{
if (row->continued_p)
@ -18480,6 +18482,25 @@ cursor_row_p (struct glyph_row *row)
result =
(!NILP (prop)
&& display_prop_string_p (prop, glyph->object));
/* If there's a `cursor' property on one of the
string's characters, this row is a cursor row,
even though this is not a display string. */
if (!result)
{
Lisp_Object s = glyph->object;
for ( ; glyph >= beg && EQ (glyph->object, s); --glyph)
{
EMACS_INT gpos = glyph->charpos;
if (!NILP (Fget_char_property (make_number (gpos),
Qcursor, s)))
{
result = 1;
break;
}
}
}
break;
}
}