# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1290710289 -7200
# Node ID 422ae4f1465ae12f84dc221bdd2883b534c756a3
# Parent  c4f2770ebd7298d8017a4272ccaa418642f64bad
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.

diff -r c4f2770ebd72 -r 422ae4f1465a src/ChangeLog
--- 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)
diff -r c4f2770ebd72 -r 422ae4f1465a src/xdisp.c
--- 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)