Mercurial > emacs

changeset 111712:422ae4f1465a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bug #7474 with cursor positioning in overlay strings. xdisp.c (set_cursor_from_row): Don't forget to consider the `cursor' property of the first character in overlay strings.
author Eli Zaretskii <eliz@gnu.org>
date Thu, 25 Nov 2010 20:38:09 +0200
parents c4f2770ebd72
children 812a929d6b55
files src/ChangeLog src/xdisp.c
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Thu Nov 25 14:51:51 2010 +0000
+++ b/src/ChangeLog	Thu Nov 25 20:38:09 2010 +0200
@@ -1,3 +1,9 @@
+2010-11-25  Eli Zaretskii  <eliz@gnu.org>
+
+	* xdisp.c (set_cursor_from_row): Don't forget to consider the
+	`cursor' property of the first character in overlay strings.
+	(Bug#7474)
+
 2010-11-24  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* nsterm.m (NSLeftControlKeyMask, NSLeftCommandKeyMask)
--- a/src/xdisp.c	Thu Nov 25 14:51:51 2010 +0000
+++ b/src/xdisp.c	Thu Nov 25 20:38:09 2010 +0200
@@ -12943,7 +12943,7 @@
 
 			  if (tem)
 			    cursor = glyph;
-			  for (glyph += incr;
+			  for ( ;
 			       (row->reversed_p ? glyph > stop : glyph < stop)
 				 && EQ (glyph->object, str);
 			       glyph += incr)