Merge from trunk.

3 files changed, 23 insertions, 6 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.
diff --git a/src/doc.c b/src/doc.c
index 9fbeb0b5ed5..b5a57d7d6f2 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -118,14 +118,16 @@ get_doc_string (Lisp_Object filepos, int unibyte, int definition)
      If it is relative, combine it with Vdoc_directory.  */
 
   tem = Ffile_name_absolute_p (file);
+  file = ENCODE_FILE (file);
   if (NILP (tem))
     {
-      minsize = SCHARS (Vdoc_directory);
+      Lisp_Object docdir = ENCODE_FILE (Vdoc_directory);
+      minsize = SCHARS (docdir);
       /* sizeof ("../etc/") == 8 */
       if (minsize < 8)
         minsize = 8;
       SAFE_ALLOCA (name, char *, minsize + SCHARS (file) + 8);
-      strcpy (name, SSDATA (Vdoc_directory));
+      strcpy (name, SSDATA (docdir));
       strcat (name, SSDATA (file));
     }
   else
@@ -140,7 +142,7 @@ get_doc_string (Lisp_Object filepos, int unibyte, int definition)
       if (!NILP (Vpurify_flag))
         {
           /* Preparing to dump; DOC file is probably not installed.
-             So check in ../etc. */
+             So check in ../etc.  */
           strcpy (name, "../etc/");
           strcat (name, SSDATA (file));
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 0be1c68780d..e9e8f8f4206 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -18653,7 +18653,12 @@ find_row_edges (struct it *it, struct glyph_row *row,
                     seen_this_string = 1;
                 }
               else
-                abort ();
+                /* If all the glyphs of the previous row were inserted
+                   by redisplay, it means the previous row was
+                   produced from a single newline, which is only
+                   possible if that newline came from the same string
+                   as the one which produced this ROW.  */
+                seen_this_string = 1;
             }
           else
             {
@@ -18669,7 +18674,7 @@ find_row_edges (struct it *it, struct glyph_row *row,
                     seen_this_string = 1;
                 }
               else
-                abort ();
+                seen_this_string = 1;
             }
         }
       /* Take note of each display string that covers a newline only