Merge from emacs-24; up to 2014-06-02T14:17:07Z!michael.albinus@gmx.de

2 files changed, 9 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6733cf176ca..0e2af2d766e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-11  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (set_cursor_from_row): Fix an off-by-one error when
+        matching overlay strings with 'cursor' property against buffer
+        positions traversed in the glyph row.  (Bug#17744)
+
 2014-06-11  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsterm.h (EmacsApp): Always compile in shouldKeepRunning, isFirst
diff --git a/src/xdisp.c b/src/xdisp.c
index c592e0c3116..54a8c8beb8f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -14413,7 +14413,7 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
                                               pos_after, 0);
 
                 if (prop_pos >= pos_before)
-                  bpos_max = prop_pos - 1;
+                  bpos_max = prop_pos;
               }
             if (INTEGERP (chprop))
               {
@@ -14487,7 +14487,7 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
                                               pos_after, 0);
 
                 if (prop_pos >= pos_before)
-                  bpos_max = prop_pos - 1;
+                  bpos_max = prop_pos;
               }
             if (INTEGERP (chprop))
               {
@@ -14517,7 +14517,7 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
      GLYPH_BEFORE and GLYPH_AFTER.  */
   if (!((row->reversed_p ? glyph > glyphs_end : glyph < glyphs_end)
         && BUFFERP (glyph->object) && glyph->charpos == pt_old)
-      && !(bpos_max < pt_old && pt_old <= bpos_covered))
+      && !(bpos_max <= pt_old && pt_old <= bpos_covered))
     {
       /* An empty line has a single glyph whose OBJECT is zero and
          whose CHARPOS is the position of a newline on that line.