4 files changed, 59 insertions, 15 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1ec148b30c8..ae8835478a5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,21 @@
+2012-03-20  Chong Yidong  <cyd@gnu.org>
+
+        * dispnew.c (Fredisplay, Vredisplay_preemption_period): Update doc
+        to reflect default non-nil value of redisplay-dont-pause.
+
+2012-03-19  Kenichi Handa  <handa@m17n.org>
+
+        * 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).
diff --git a/src/dispnew.c b/src/dispnew.c
index d2c2668864e..1f494b5685b 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6081,10 +6081,14 @@ sit_for (Lisp_Object timeout, int reading, int do_display)
 
 
 DEFUN ("redisplay", Fredisplay, Sredisplay, 0, 1, 0,
-       doc: /* Perform redisplay if no input is available.
-If optional arg FORCE is non-nil or `redisplay-dont-pause' is non-nil,
-perform a full redisplay even if input is available.
-Return t if redisplay was performed, nil otherwise.  */)
+       doc: /* Perform redisplay.
+Optional arg FORCE, if non-nil, prevents redisplay from being
+preempted by arriving input, even if `redisplay-dont-pause' is nil.
+If `redisplay-dont-pause' is non-nil (the default), redisplay is never
+preempted by arriving input, so FORCE does nothing.
+
+Return t if redisplay was performed, nil if redisplay was preempted
+immediately by pending input.  */)
   (Lisp_Object force)
 {
   int count;
@@ -6534,21 +6538,21 @@ syms_of_display (void)
   DEFSYM (Qredisplay_dont_pause, "redisplay-dont-pause");
 
   DEFVAR_INT ("baud-rate", baud_rate,
-              doc: /* *The output baud rate of the terminal.
+              doc: /* The output baud rate of the terminal.
 On most systems, changing this value will affect the amount of padding
 and the other strategic decisions made during redisplay.  */);
 
   DEFVAR_BOOL ("inverse-video", inverse_video,
-               doc: /* *Non-nil means invert the entire frame display.
+               doc: /* Non-nil means invert the entire frame display.
 This means everything is in inverse video which otherwise would not be.  */);
 
   DEFVAR_BOOL ("visible-bell", visible_bell,
-               doc: /* *Non-nil means try to flash the frame to represent a bell.
+               doc: /* Non-nil means try to flash the frame to represent a bell.
 
 See also `ring-bell-function'.  */);
 
   DEFVAR_BOOL ("no-redraw-on-reenter", no_redraw_on_reenter,
-               doc: /* *Non-nil means no need to redraw entire frame after suspending.
+               doc: /* Non-nil means no need to redraw entire frame after suspending.
 A non-nil value is useful if the terminal can automatically preserve
 Emacs's frame display when you reenter Emacs.
 It is up to you to set this variable if your terminal can do that.  */);
@@ -6603,14 +6607,15 @@ See `buffer-display-table' for more information.  */);
   Vstandard_display_table = Qnil;
 
   DEFVAR_BOOL ("redisplay-dont-pause", redisplay_dont_pause,
-               doc: /* *Non-nil means display update isn't paused when input is detected.  */);
+               doc: /* Non-nil means display update isn't paused when input is detected.  */);
   redisplay_dont_pause = 1;
 
 #if PERIODIC_PREEMPTION_CHECKING
   DEFVAR_LISP ("redisplay-preemption-period", Vredisplay_preemption_period,
-               doc: /* *The period in seconds between checking for input during redisplay.
-If input is detected, redisplay is pre-empted, and the input is processed.
-If nil, never pre-empt redisplay.  */);
+               doc: /* Period in seconds between checking for input during redisplay.
+This has an effect only if `redisplay-dont-pause' is nil; in that
+case, arriving input preempts redisplay until the input is processed.
+If the value is nil, redisplay is never preempted.  */);
   Vredisplay_preemption_period = make_float (0.10);
 #endif
 
diff --git a/src/ftfont.c b/src/ftfont.c
index 3c45eb2f72f..131465b4f85 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -1856,7 +1856,7 @@ ftfont_drive_otf (MFLTFont *font,
   setup_otf_gstring (len);
   for (i = 0; i < len; i++)
     {
-      otf_gstring.glyphs[i].c = in->glyphs[from + i].c;
+      otf_gstring.glyphs[i].c = in->glyphs[from + i].c & 0x11FFFF;
       otf_gstring.glyphs[i].glyph_id = in->glyphs[from + i].code;
     }
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 47eb75221e9..da2b78f67e3 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -18561,9 +18561,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)
@@ -18585,6 +18587,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;
                   }
             }