merge trunk

3 files changed, 38 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 80bc42fa8c6..8b1221ab6d8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,18 @@
         * ftfont.c (ftfont_drive_otf): Mask bits of character code to make
         it fit in a valid range (Bug#11003).
 
+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).
+
 2012-03-12  Chong Yidong  <cyd@gnu.org>
 
         * eval.c (inhibit_lisp_code): Rename from
diff --git a/src/buffer.c b/src/buffer.c
index efb9a80f35d..1fea19b0d65 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2868,7 +2868,9 @@ compare_overlays (const void *v1, const void *v2)
      between "equal" overlays.  The result can still change between
      invocations of Emacs, but it won't change in the middle of
      `find_field' (bug#6830).  */
-  return XHASH (s1->overlay) < XHASH (s2->overlay) ? -1 : 1;
+  if (XHASH (s1->overlay) != XHASH (s2->overlay))
+    return XHASH (s1->overlay) < XHASH (s2->overlay) ? -1 : 1;
+  return 0;
 }
 
 /* Sort an array of overlays by priority.  The array is modified in place.
diff --git a/src/xdisp.c b/src/xdisp.c
index 62d0d187a19..71162960faa 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -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;
                   }
             }