Merge from trunk.

1 files changed, 94 insertions, 1 deletions

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>