Merge from trunk.

10 files changed, 325 insertions, 90 deletions

diff --git a/src/.gdbinit b/src/.gdbinit
index 0f51a00ea76..b908ef005d6 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -483,83 +483,83 @@ end
 define pgx
   set $g = $arg0
   # CHAR_GLYPH
-  if ($g->type == 0)
-    if ($g->u.ch >= ' ' && $g->u.ch < 127)
-      printf "CHAR[%c]", $g->u.ch
+  if ($g.type == 0)
+    if ($g.u.ch >= ' ' && $g.u.ch < 127)
+      printf "CHAR[%c]", $g.u.ch
     else
-      printf "CHAR[0x%x]", $g->u.ch
+      printf "CHAR[0x%x]", $g.u.ch
     end
   end
   # COMPOSITE_GLYPH
-  if ($g->type == 1)
-    printf "COMP[%d (%d..%d)]", $g->u.cmp.id, $g->slice.cmp.from, $g->slice.cmp.to
+  if ($g.type == 1)
+    printf "COMP[%d (%d..%d)]", $g.u.cmp.id, $g.slice.cmp.from, $g.slice.cmp.to
   end
   # GLYPHLESS_GLYPH
-  if ($g->type == 2)
+  if ($g.type == 2)
     printf "GLYPHLESS["
-    if ($g->u.glyphless.method == 0)
+    if ($g.u.glyphless.method == 0)
       printf "THIN]"
     end
-    if ($g->u.glyphless.method == 1)
+    if ($g.u.glyphless.method == 1)
       printf "EMPTY]"
     end
-    if ($g->u.glyphless.method == 2)
+    if ($g.u.glyphless.method == 2)
       printf "ACRO]"
     end
-    if ($g->u.glyphless.method == 3)
+    if ($g.u.glyphless.method == 3)
       printf "HEX]"
     end
   end
   # IMAGE_GLYPH
-  if ($g->type == 3)
-    printf "IMAGE[%d]", $g->u.img_id
+  if ($g.type == 3)
+    printf "IMAGE[%d]", $g.u.img_id
   end
   # STRETCH_GLYPH
-  if ($g->type == 4)
-    printf "STRETCH[%d+%d]", $g->u.stretch.height, $g->u.stretch.ascent
+  if ($g.type == 4)
+    printf "STRETCH[%d+%d]", $g.u.stretch.height, $g.u.stretch.ascent
   end
-  xgettype ($g->object)
+  xgettype ($g.object)
   if ($type == Lisp_String)
-    printf " str=%x[%d]", $g->object, $g->charpos
+    printf " str=%x[%d]", $g.object, $g.charpos
   else
-    printf " pos=%d", $g->charpos
+    printf " pos=%d", $g.charpos
   end
   # For characters, print their resolved level and bidi type
-  if ($g->type == 0)
-    printf " blev=%d,btyp=", $g->resolved_level
-    pbiditype $g->bidi_type
+  if ($g.type == 0)
+    printf " blev=%d,btyp=", $g.resolved_level
+    pbiditype $g.bidi_type
   end
-  printf " w=%d a+d=%d+%d", $g->pixel_width, $g->ascent, $g->descent
+  printf " w=%d a+d=%d+%d", $g.pixel_width, $g.ascent, $g.descent
   # If not DEFAULT_FACE_ID
-  if ($g->face_id != 0)
-    printf " face=%d", $g->face_id
+  if ($g.face_id != 0)
+    printf " face=%d", $g.face_id
   end
-  if ($g->voffset)
-    printf " vof=%d", $g->voffset
+  if ($g.voffset)
+    printf " vof=%d", $g.voffset
   end
-  if ($g->multibyte_p)
+  if ($g.multibyte_p)
     printf " MB"
   end
-  if ($g->padding_p)
+  if ($g.padding_p)
     printf " PAD"
   end
-  if ($g->glyph_not_available_p)
+  if ($g.glyph_not_available_p)
     printf " N/A"
   end
-  if ($g->overlaps_vertically_p)
+  if ($g.overlaps_vertically_p)
     printf " OVL"
   end
-  if ($g->avoid_cursor_p)
+  if ($g.avoid_cursor_p)
     printf " AVOID"
   end
-  if ($g->left_box_line_p)
+  if ($g.left_box_line_p)
     printf " ["
   end
-  if ($g->right_box_line_p)
+  if ($g.right_box_line_p)
     printf " ]"
   end
-  if ($g->slice.img.x || $g->slice.img.y || $g->slice.img.width || $g->slice.img.height)
-    printf " slice=%d,%d,%d,%d" ,$g->slice.img.x, $g->slice.img.y, $g->slice.img.width, $g->slice.img.height
+  if ($g.slice.img.x || $g.slice.img.y || $g.slice.img.width || $g.slice.img.height)
+    printf " slice=%d,%d,%d,%d" ,$g.slice.img.x, $g.slice.img.y, $g.slice.img.width, $g.slice.img.height
   end
   printf "\n"
 end
diff --git a/src/ChangeLog b/src/ChangeLog
index 1f8fd4f6b50..de618a225e3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -744,6 +744,99 @@
         rather than rolling our own approximation.
         (SCROLL_BAR_VEC_SIZE): Remove; not used.
 
+2011-09-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (pop_it): Allow it->object that is a cons cell to pass
+        the xassert test.
+
+        * dispextern.h (struct it): Update the comment documenting what
+        can it->OBJECT be.
+
+2011-09-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (set_cursor_from_row): If the row ends in a newline from
+        a display string, extend search for cursor position to end of row.
+        (find_row_edges): If the row ends in a newline from a display
+        string, increment its MATRIX_ROW_END_CHARPOS by one.  (Bug#9549)
+        Handle the case of a display string with multiple newlines.
+        (Fcurrent_bidi_paragraph_direction): Fix search for previous
+        non-empty line.  Fixes confusing cursor motion with arrow keys at
+        the beginning of a line that starts with whitespace.
+
+2011-09-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * lread.c (Fread_from_string): Document what FINAL-STRING-INDEX is
+        (bug#9493).
+
+2011-09-18  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xfns.c (Fx_create_frame): Handle the bitmapIcon resource as
+        boolean (Bug#9154).
+
+2011-09-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (display_line): Record maximum and minimum buffer
+        positions even if no glyphs were produced (e.g., by a zero-width
+        stretch).  Fixes bug#9530 on a TTY.  Under word-wrap, don't record
+        buffer positions that will be removed from the glyph row because
+        they don't fit.
+        (produce_stretch_glyph): Fix a bug in :align-to on a TTY when the
+        column is beyond frame width: don't subtract 1 "pixel" when
+        computing width of the stretch.
+        (reseat_at_next_visible_line_start): Undo the change made on
+        2011-09-17 that saved paragraph information and restored it after
+        the call to `reseat'.  (Bug#9545)
+
+2011-09-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * xdisp.c (expose_window): Save original value of phys_cursor_on_p
+        and turn window cursor on if cleared (Bug#9415).
+
+2011-09-18  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * search.c (boyer_moore): Take unibyte characters from pattern
+        literally.  (Bug#9458)
+
+2011-09-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (reseat_at_next_visible_line_start): Fix last change.
+
+2011-09-18  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Fix minor problem found by static checking.
+        * xdisp.c (reseat_at_next_visible_line_start): Mark locals as
+        initialized, to pacify gcc -Wuninitialized.
+
+        * fileio.c: Report proper errno when syscall falls.
+        (Finsert_file_contents): Save and restore errno,
+        so that report_file_error outputs the correct diagnostic.
+        (Fwrite_region) [CLASH_DETECTION]: Likewise.
+
+2011-09-18  Eli Zaretskii  <eliz@gnu.org>
+
+        * .gdbinit (pgx): Fix references to fields of `struct glyph'.
+
+2011-09-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (produce_stretch_glyph): Another fix for changes made on
+        2011-08-30T17:32:44Z!eliz@gnu.org.  (Bug#9530)
+
+2011-09-17  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (reseat_at_next_visible_line_start): Keep information
+        about the current paragraph and restore it after the call to
+        reseat.
+
+        * bidi.c (MAX_PARAGRAPH_SEARCH): New macro.
+        (bidi_find_paragraph_start): Search back for paragraph beginning
+        at most MAX_PARAGRAPH_SEARCH lines; if not found, return BEGV_BYTE.
+        (bidi_move_to_visually_next): Only trigger paragraph-related
+        computations when the last character is a newline or at EOB, not
+        just any NEUTRAL_B.  (Bug#9470)
+
+        * xdisp.c (set_cursor_from_row): Don't invoke special treatment of
+        truncated lines if point is covered by a display string.  (Bug#9524)
+
 2011-09-16  Paul Eggert  <eggert@cs.ucla.edu>
 
         * xselect.c: Relax test for outgoing X longs (Bug#9498).
@@ -2044,7 +2137,7 @@
         underline, overline, and strike-through.
         (ns_dumpglyphs_image, ns_dumpglyphs_stretch): Add call to
         ns_draw_text_decoration.  Change treatment of cursor drawing to
-        accomodate underlining, etc.
+        accommodate underlining, etc.
 
 2011-07-28  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/src/bidi.c b/src/bidi.c
index 11013edc70d..cac12854f33 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -1071,15 +1071,25 @@ bidi_at_paragraph_end (ptrdiff_t charpos, ptrdiff_t bytepos)
   return val;
 }
 
+/* On my 2005-vintage machine, searching back for paragraph start
+   takes ~1 ms per line.  And bidi_paragraph_init is called 4 times
+   when user types C-p.  The number below limits each call to
+   bidi_paragraph_init to about 10 ms.  */
+#define MAX_PARAGRAPH_SEARCH 7500
+
 /* Find the beginning of this paragraph by looking back in the buffer.
-   Value is the byte position of the paragraph's beginning.  */
+   Value is the byte position of the paragraph's beginning, or
+   BEGV_BYTE if paragraph_start_re is still not found after looking
+   back MAX_PARAGRAPH_SEARCH lines in the buffer.  */
 static ptrdiff_t
 bidi_find_paragraph_start (ptrdiff_t pos, ptrdiff_t pos_byte)
 {
   Lisp_Object re = paragraph_start_re;
   ptrdiff_t limit = ZV, limit_byte = ZV_BYTE;
+  ptrdiff_t n = 0;
 
   while (pos_byte > BEGV_BYTE
+         && n++ < MAX_PARAGRAPH_SEARCH
          && fast_looking_at (re, pos, pos_byte, limit, limit_byte, Qnil) < 0)
     {
       /* FIXME: What if the paragraph beginning is covered by a
@@ -1089,6 +1099,8 @@ bidi_find_paragraph_start (ptrdiff_t pos, ptrdiff_t pos_byte)
       pos = find_next_newline_no_quit (pos - 1, -1);
       pos_byte = CHAR_TO_BYTE (pos);
     }
+  if (n >= MAX_PARAGRAPH_SEARCH)
+    pos_byte = BEGV_BYTE;
   return pos_byte;
 }
 
@@ -2239,7 +2251,8 @@ bidi_move_to_visually_next (struct bidi_it *bidi_it)
     GCPRO1 (bidi_it->string.lstring);
 
   /* If we just passed a newline, initialize for the next line.  */
-  if (!bidi_it->first_elt && bidi_it->orig_type == NEUTRAL_B)
+  if (!bidi_it->first_elt
+      && (bidi_it->ch == '\n' || bidi_it->ch == BIDI_EOB))
     bidi_line_init (bidi_it);
 
   /* Prepare the sentinel iterator state, and cache it.  When we bump
@@ -2320,7 +2333,8 @@ bidi_move_to_visually_next (struct bidi_it *bidi_it)
      reordering, whereas we _must_ know the paragraph base direction
      _before_ we process the paragraph's text, since the base
      direction affects the reordering.  */
-  if (bidi_it->scan_dir == 1 && bidi_it->orig_type == NEUTRAL_B)
+  if (bidi_it->scan_dir == 1
+      && (bidi_it->ch == '\n' || bidi_it->ch == BIDI_EOB))
     {
       /* The paragraph direction of the entire string, once
          determined, is in effect for the entire string.  Setting the
diff --git a/src/dispextern.h b/src/dispextern.h
index 76f3686c37a..dfef2884297 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2398,9 +2398,19 @@ struct it
   Lisp_Object font_height;
 
   /* Object and position where the current display element came from.
-     Object can be a Lisp string in case the current display element
-     comes from an overlay string, or it is buffer.  It may also be nil
-     during mode-line update.  Position is a position in object.  */
+     Object is normally the buffer which is being rendered, but it can
+     also be a Lisp string in case the current display element comes
+     from an overlay string or from a display string (before- or
+     after-string).  It may also be nil when a C string is being
+     rendered, e.g., during mode-line or header-line update.  It can
+     also be a cons cell of the form `(space ...)', when we produce a
+     stretch glyph from a `display' specification.  Finally, it can be
+     a zero-valued Lisp integer, but only temporarily, when we are
+     producing special glyphs for display purposes, like truncation
+     and continuation glyphs, or blanks that extend each line to the
+     edge of the window on a TTY.
+
+     Position is the current iterator position in object.  */
   Lisp_Object object;
   struct text_pos position;
 
diff --git a/src/fileio.c b/src/fileio.c
index 486c3d4c175..110977b3a60 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3189,6 +3189,7 @@ variable `last-coding-system-used' to the coding system actually used.  */)
   Lisp_Object p;
   ptrdiff_t total = 0;
   int not_regular = 0;
+  int save_errno = 0;
   char read_buf[READ_BUF_SIZE];
   struct coding_system coding;
   char buffer[1 << 14];
@@ -3253,6 +3254,7 @@ variable `last-coding-system-used' to the coding system actually used.  */)
 #endif /* WINDOWSNT */
     {
     badopen:
+      save_errno = errno;
       if (NILP (visit))
         report_file_error ("Opening input file", Fcons (orig_filename, Qnil));
       st.st_mtime = -1;
@@ -4288,6 +4290,7 @@ variable `last-coding-system-used' to the coding system actually used.  */)
       && current_buffer->modtime == -1)
     {
       /* If visiting nonexistent file, return nil.  */
+      errno = save_errno;
       report_file_error ("Opening input file", Fcons (orig_filename, Qnil));
     }
 
@@ -4625,7 +4628,9 @@ This calls `write-region-annotate-functions' at the start, and
       if (ret < 0)
         {
 #ifdef CLASH_DETECTION
+          save_errno = errno;
           if (!auto_saving) unlock_file (lockname);
+          errno = save_errno;
 #endif /* CLASH_DETECTION */
           UNGCPRO;
           report_file_error ("Lseek error", Fcons (filename, Qnil));
diff --git a/src/lread.c b/src/lread.c
index 3a1b3f0c9c5..7b3e0df5e8a 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1967,6 +1967,8 @@ STREAM or the value of `standard-input' may be:
 DEFUN ("read-from-string", Fread_from_string, Sread_from_string, 1, 3, 0,
        doc: /* Read one Lisp expression which is represented as text by STRING.
 Returns a cons: (OBJECT-READ . FINAL-STRING-INDEX).
+FINAL-STRING-INDEX is an integer giving the position of the next
+ remaining chararacter in STRING.
 START and END optionally delimit a substring of STRING from which to read;
  they default to 0 and (length STRING) respectively.  */)
   (Lisp_Object string, Lisp_Object start, Lisp_Object end)
diff --git a/src/search.c b/src/search.c
index 7dc88268c76..dc76998d000 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1761,7 +1761,7 @@ boyer_moore (EMACS_INT n, unsigned char *base_pat,
                 ch = -1;
             }
 
-          if (ch >= 0200)
+          if (ch >= 0200 && multibyte)
             j = (ch & 0x3F) | 0200;
           else
             j = *ptr;
@@ -1780,7 +1780,7 @@ boyer_moore (EMACS_INT n, unsigned char *base_pat,
               while (1)
                 {
                   TRANSLATE (ch, inverse_trt, ch);
-                  if (ch >= 0200)
+                  if (ch >= 0200 && multibyte)
                     j = (ch & 0x3F) | 0200;
                   else
                     j = ch;
diff --git a/src/xdisp.c b/src/xdisp.c
index 763862cd0e3..49c4b74c828 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -5467,7 +5467,8 @@ pop_it (struct it *it)
                 && IT_BYTEPOS (*it) == it->bidi_it.bytepos)
                || (STRINGP (it->object)
                    && IT_STRING_CHARPOS (*it) == it->bidi_it.charpos
-                   && IT_STRING_BYTEPOS (*it) == it->bidi_it.bytepos));
+                   && IT_STRING_BYTEPOS (*it) == it->bidi_it.bytepos)
+               || (CONSP (it->object) && it->method == GET_FROM_STRETCH));
     }
 }
 
@@ -13644,15 +13645,17 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
                /* A truncated row may not include PT among its
                   character positions.  Setting the cursor inside the
                   scroll margin will trigger recalculation of hscroll
-                  in hscroll_window_tree.  */
-               || (row->truncated_on_left_p && pt_old < bpos_min)
-               || (row->truncated_on_right_p && pt_old > bpos_max)
-               /* Zero-width characters produce no glyphs.  */
+                  in hscroll_window_tree.  But if a display string
+                  covers point, defer to the string-handling code
+                  below to figure this out.  */
                || (!string_seen
-                   && !empty_line_p
-                   && (row->reversed_p
-                       ? glyph_after > glyphs_end
-                       : glyph_after < glyphs_end)))
+                   && ((row->truncated_on_left_p && pt_old < bpos_min)
+                       || (row->truncated_on_right_p && pt_old > bpos_max)
+                       /* Zero-width characters produce no glyphs.  */
+                       || (!empty_line_p
+                           && (row->reversed_p
+                               ? glyph_after > glyphs_end
+                               : glyph_after < glyphs_end)))))
         {
           cursor = glyph_after;
           x = -1;
@@ -13671,6 +13674,17 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
 
           x = -1;
 
+          /* If the row ends in a newline from a display string,
+             reordering could have moved the glyphs belonging to the
+             string out of the [GLYPH_BEFORE..GLYPH_AFTER] range.  So
+             in this case we extend the search to the last glyph in
+             the row that was not inserted by redisplay.  */
+          if (row->ends_in_newline_from_string_p)
+            {
+              glyph_after = end;
+              pos_after = MATRIX_ROW_END_CHARPOS (row) + delta;
+            }
+
           /* GLYPH_BEFORE and GLYPH_AFTER are the glyphs that
              correspond to POS_BEFORE and POS_AFTER, respectively.  We
              need START and STOP in the order that corresponds to the
@@ -18346,7 +18360,8 @@ find_row_edges (struct it *it, struct glyph_row *row,
      Line ends in a newline from buffer       eol_pos + 1
      Line is continued from buffer            max_pos + 1
      Line is truncated on right               it->current.pos
-     Line ends in a newline from string       max_pos
+     Line ends in a newline from string       max_pos + 1(*)
+      (*) + 1 only when line ends in a forward scan
      Line is continued from string            max_pos
      Line is continued from display vector    max_pos
      Line is entirely from a string           min_pos == max_pos
@@ -18359,8 +18374,76 @@ find_row_edges (struct it *it, struct glyph_row *row,
     row->maxpos = it->current.pos;
   else if (row->used[TEXT_AREA])
     {
-      if (row->ends_in_newline_from_string_p)
-        SET_TEXT_POS (row->maxpos, max_pos, max_bpos);
+      int seen_this_string = 0;
+      struct glyph_row *r1 = row - 1;
+
+      /* Did we see the same display string on the previous row?  */
+      if (STRINGP (it->object)
+          /* this is not the first row */
+          && row > it->w->desired_matrix->rows
+          /* previous row is not the header line */
+          && !r1->mode_line_p
+          /* previous row also ends in a newline from a string */
+          && r1->ends_in_newline_from_string_p)
+        {
+          struct glyph *start, *end;
+
+          /* Search for the last glyph of the previous row that came
+             from buffer or string.  Depending on whether the row is
+             L2R or R2L, we need to process it front to back or the
+             other way round.  */
+          if (!r1->reversed_p)
+            {
+              start = r1->glyphs[TEXT_AREA];
+              end = start + r1->used[TEXT_AREA];
+              /* Glyphs inserted by redisplay have an integer (zero)
+                 as their object.  */
+              while (end > start
+                     && INTEGERP ((end - 1)->object)
+                     && (end - 1)->charpos <= 0)
+                --end;
+              if (end > start)
+                {
+                  if (EQ ((end - 1)->object, it->object))
+                    seen_this_string = 1;
+                }
+              else
+                abort ();
+            }
+          else
+            {
+              end = r1->glyphs[TEXT_AREA] - 1;
+              start = end + r1->used[TEXT_AREA];
+              while (end < start
+                     && INTEGERP ((end + 1)->object)
+                     && (end + 1)->charpos <= 0)
+                ++end;
+              if (end < start)
+                {
+                  if (EQ ((end + 1)->object, it->object))
+                    seen_this_string = 1;
+                }
+              else
+                abort ();
+            }
+        }
+      /* Take note of each display string that covers a newline only
+         once, the first time we see it.  This is for when a display
+         string includes more than one newline in it.  */
+      if (row->ends_in_newline_from_string_p && !seen_this_string)
+        {
+          /* If we were scanning the buffer forward when we displayed
+             the string, we want to account for at least one buffer
+             position that belongs to this row (position covered by
+             the display string), so that cursor positioning will
+             consider this row as a candidate when point is at the end
+             of the visual line represented by this row.  This is not
+             required when scanning back, because max_pos will already
+             have a much larger value.  */
+          if (CHARPOS (row->end.pos) > max_pos)
+            INC_BOTH (max_pos, max_bpos);
+          SET_TEXT_POS (row->maxpos, max_pos, max_bpos);
+        }
       else if (CHARPOS (it->eol_pos) > 0)
         SET_TEXT_POS (row->maxpos,
                       CHARPOS (it->eol_pos) + 1, BYTEPOS (it->eol_pos) + 1);
@@ -18668,11 +18751,6 @@ display_line (struct it *it)
                       it->current_x = new_x;
                       it->continuation_lines_width += new_x;
                       ++it->hpos;
-                      /* Record the maximum and minimum buffer
-                         positions seen so far in glyphs that will be
-                         displayed by this row.  */
-                      if (it->bidi_p)
-                        RECORD_MAX_MIN_POS (it);
                       if (i == nglyphs - 1)
                         {
                           /* If line-wrap is on, check if a previous
@@ -18687,6 +18765,11 @@ display_line (struct it *it)
                                   || IT_DISPLAYING_WHITESPACE (it)))
                             goto back_to_wrap;
 
+                          /* Record the maximum and minimum buffer
+                             positions seen so far in glyphs that will be
+                             displayed by this row.  */
+                          if (it->bidi_p)
+                            RECORD_MAX_MIN_POS (it);
                           set_iterator_to_next (it, 1);
                           if (IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
                             {
@@ -18704,6 +18787,8 @@ display_line (struct it *it)
                                 }
                             }
                         }
+                      else if (it->bidi_p)
+                        RECORD_MAX_MIN_POS (it);
                     }
                   else if (CHAR_GLYPH_PADDING_P (*glyph)
                            && !FRAME_WINDOW_P (it->f))
@@ -18834,6 +18919,10 @@ display_line (struct it *it)
                   xassert (it->first_visible_x <= it->last_visible_x);
                 }
             }
+          /* Even if this display element produced no glyphs at all,
+             we want to record its position.  */
+          if (it->bidi_p && nglyphs == 0)
+            RECORD_MAX_MIN_POS (it);
 
           row->ascent = max (row->ascent, it->max_ascent);
           row->height = max (row->height, it->max_ascent + it->max_descent);
@@ -19124,6 +19213,7 @@ See also `bidi-paragraph-direction'.  */)
       ptrdiff_t pos = BUF_PT (buf);
       ptrdiff_t bytepos = BUF_PT_BYTE (buf);
       int c;
+      void *itb_data = bidi_shelve_cache ();
 
       set_buffer_temp (buf);
       /* bidi_paragraph_init finds the base direction of the paragraph
@@ -19136,27 +19226,27 @@ See also `bidi-paragraph-direction'.  */)
           pos--;
           bytepos = CHAR_TO_BYTE (pos);
         }
-      while ((c = FETCH_BYTE (bytepos)) == '\n'
-             || c == ' ' || c == '\t' || c == '\f')
+      if (fast_looking_at (build_string ("[\f\t ]*\n"),
+                           pos, bytepos, ZV, ZV_BYTE, Qnil) > 0)
         {
-          if (bytepos <= BEGV_BYTE)
-            break;
-          bytepos--;
-          pos--;
+          while ((c = FETCH_BYTE (bytepos)) == '\n'
+                 || c == ' ' || c == '\t' || c == '\f')
+            {
+              if (bytepos <= BEGV_BYTE)
+                break;
+              bytepos--;
+              pos--;
+            }
+          while (!CHAR_HEAD_P (FETCH_BYTE (bytepos)))
+            bytepos--;
         }
-      while (!CHAR_HEAD_P (FETCH_BYTE (bytepos)))
-        bytepos--;
-      itb.charpos = pos;
-      itb.bytepos = bytepos;
-      itb.nchars = -1;
+      bidi_init_it (pos, bytepos, FRAME_WINDOW_P (SELECTED_FRAME ()), &itb);
       itb.string.s = NULL;
       itb.string.lstring = Qnil;
-      itb.frame_window_p = FRAME_WINDOW_P (SELECTED_FRAME ()); /* guesswork */
-      itb.first_elt = 1;
-      itb.separator_limit = -1;
-      itb.paragraph_dir = NEUTRAL_DIR;
-
+      itb.string.bufpos = 0;
+      itb.string.unibyte = 0;
       bidi_paragraph_init (NEUTRAL_DIR, &itb, 1);
+      bidi_unshelve_cache (itb_data, 0);
       set_buffer_temp (old);
       switch (itb.paragraph_dir)
         {
@@ -23251,7 +23341,14 @@ produce_stretch_glyph (struct it *it)
 
   if (width > 0 && it->line_wrap != TRUNCATE
       && it->current_x + width > it->last_visible_x)
-    width = it->last_visible_x - it->current_x - 1;
+    {
+      width = it->last_visible_x - it->current_x;
+#ifdef HAVE_WINDOW_SYSTEM
+      /* Subtact one more pixel from the stretch width, but only on
+         GUI frames, since on a TTY each glyph is one "pixel" wide.  */
+      width -= FRAME_WINDOW_P (it->f);
+#endif
+    }
 
   if (width > 0 && height > 0 && it->glyph_row)
     {
@@ -23263,14 +23360,7 @@ produce_stretch_glyph (struct it *it)
         object = it->w->buffer;
 #ifdef HAVE_WINDOW_SYSTEM
       if (FRAME_WINDOW_P (it->f))
-        {
-          append_stretch_glyph (it, object, width, height, ascent);
-          it->pixel_width = width;
-          it->ascent = it->phys_ascent = ascent;
-          it->descent = it->phys_descent = height - it->ascent;
-          it->nglyphs = width > 0 && height > 0 ? 1 : 0;
-          take_vertical_position_into_account (it);
-        }
+        append_stretch_glyph (it, object, width, height, ascent);
       else
 #endif
         {
@@ -23282,6 +23372,19 @@ produce_stretch_glyph (struct it *it)
           it->object = o_object;
         }
     }
+
+  it->pixel_width = width;
+#ifdef HAVE_WINDOW_SYSTEM
+  if (FRAME_WINDOW_P (it->f))
+    {
+      it->ascent = it->phys_ascent = ascent;
+      it->descent = it->phys_descent = height - it->ascent;
+      it->nglyphs = width > 0 && height > 0 ? 1 : 0;
+      take_vertical_position_into_account (it);
+    }
+  else
+#endif
+    it->nglyphs = width;
 }
 
 #ifdef HAVE_WINDOW_SYSTEM
@@ -27219,7 +27322,7 @@ expose_window (struct window *w, XRectangle *fr)
     {
       int yb = window_text_bottom_y (w);
       struct glyph_row *row;
-      int cursor_cleared_p;
+      int cursor_cleared_p, phys_cursor_on_p;
       struct glyph_row *first_overlapping_row, *last_overlapping_row;
 
       TRACE ((stderr, "expose_window (%d, %d, %d, %d)\n",
@@ -27239,6 +27342,13 @@ expose_window (struct window *w, XRectangle *fr)
       else
         cursor_cleared_p = 0;
 
+      /* If the row containing the cursor extends face to end of line,
+         then expose_area might overwrite the cursor outside the
+         rectangle and thus notice_overwritten_cursor might clear
+         w->phys_cursor_on_p.  We remember the original value and
+         check later if it is changed.  */
+      phys_cursor_on_p = w->phys_cursor_on_p;
+
       /* Update lines intersecting rectangle R.  */
       first_overlapping_row = last_overlapping_row = NULL;
       for (row = w->current_matrix->rows;
@@ -27305,7 +27415,8 @@ expose_window (struct window *w, XRectangle *fr)
           x_draw_vertical_border (w);
 
           /* Turn the cursor on again.  */
-          if (cursor_cleared_p)
+          if (cursor_cleared_p
+              || (phys_cursor_on_p && !w->phys_cursor_on_p))
             update_window_cursor (w, 1);
         }
     }
diff --git a/src/xfns.c b/src/xfns.c
index 4a7c17e1152..ba73bdba70b 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3369,7 +3369,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
   /* We need to do this after creating the X window, so that the
      icon-creation functions can say whose icon they're describing.  */
   x_default_parameter (f, parms, Qicon_type, Qt,
-                       "bitmapIcon", "BitmapIcon", RES_TYPE_SYMBOL);
+                       "bitmapIcon", "BitmapIcon", RES_TYPE_BOOLEAN);
 
   x_default_parameter (f, parms, Qauto_raise, Qnil,
                        "autoRaise", "AutoRaiseLower", RES_TYPE_BOOLEAN);
diff --git a/src/xmenu.c b/src/xmenu.c
index f7497955e93..eab25d709f6 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -742,7 +742,7 @@ menu_highlight_callback (GtkWidget *widget, gpointer call_data)
   /* If popup_activated_flag is greater than 1 we are in a popup menu.
      Don't pass the frame to show_help_event for those.
      Passing frame creates an Emacs event.  As we are looping in
-     popup_widget_loop, it won't be handeled.  Passing NULL shows the tip
+     popup_widget_loop, it won't be handled.  Passing NULL shows the tip
      directly without using an Emacs event.  This is what the Lucid code
      does below.  */
   show_help_event (popup_activated_flag <= 1 ? cb_data->cl_data->f : NULL,