Merge from trunk.

1 files changed, 11 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9bcbc92f5a4..e22eab5f072 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-10-12  Paul Eggert  <eggert@cs.ucla.edu>
+2011-10-13  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix integer width and related bugs.
         * alloc.c (pure_bytes_used_lisp, pure_bytes_used_non_lisp):
@@ -789,6 +789,16 @@
 
 2011-10-12  Eli Zaretskii  <eliz@gnu.org>
 
+        * xdisp.c (find_row_edges): Handle the case where ROW comes from a
+        display string and the previous row comes from the same string and
+        is empty.  (Bug#9739)  (Bug#9738)
+
+2011-10-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * doc.c (get_doc_string): Encode file name (bug#9735).
+
+2011-10-12  Eli Zaretskii  <eliz@gnu.org>
+
         * bidi.c (bidi_level_of_next_char):
         * xdisp.c (get_visually_first_element): Remove old incorrect
         comments regarding the Unicode Line Separator character.