upstream

1 files changed, 24 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 12a45918e87..44a76068313 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,27 @@
+2011-09-23  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * emacs.c (Fkill_emacs): In noninteractive mode exit
+        non-successfully if a write error occurred on stdout.  (Bug#9574)
+
+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