8 files changed, 156 insertions, 94 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9cef045c029..e7cd83305ee 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,54 @@
+2011-10-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (Fcurrent_bidi_paragraph_direction): Initialize
+        itb.paragraph_dir to NEUTRAL_DIR.  Fixes an occasional incorrect
+        cursor motion with <left> and <right> arrow keys.
+
+        * bidi.c (bidi_init_it): Don't initialize paragraph_dir here, as
+        some callers set that themselves.
+
+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.
+
+        * bidi.c (bidi_init_it): Initialize paragraph_dir to NEUTRAL_DIR.
+
+2011-10-12  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * alloc.c (Fgc_status): Do not access beyond zombies array
+        boundary if nzombies > MAX_ZOMBIES.
+        * alloc.c (dump_zombies): Add missing format specifier.
+
+2011-10-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * xdisp.c (set_cursor_from_row): Simplify conditionals,
+        to pacify GCC 4.6.1 x86-64 with -O2 -Wstrict-overflow.
+
+        * lread.c (read_escape): Allow hex escapes as large as ?\xfffffff.
+        Some packages use them to denote characters with modifiers.
+
+2011-10-11  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * lisp.h (GCPRO1_VAR, GCPRO2_VAR, GCPRO3_VAR, GCPRO4_VAR)
+        (GCPRO5_VAR, GCPRO6_VAR, UNGCPRO_VAR): Add whitespace to avoid
+        matching a pp-number.  Rename parameter var to var1.
+
+2011-10-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuf.c (Finternal_complete_buffer): Fix last change (bug#9709).
+
 2011-10-08  Glenn Morris  <rgm@gnu.org>
 
         * callint.c (Fcall_interactively): Give a more explicit error for the
diff --git a/src/alloc.c b/src/alloc.c
index 09ef4b085df..6e999a0ba6d 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -4071,7 +4071,7 @@ DEFUN ("gc-status", Fgc_status, Sgc_status, 0, 0, "",
 {
   Lisp_Object args[8], zombie_list = Qnil;
   EMACS_INT i;
-  for (i = 0; i < nzombies; i++)
+  for (i = 0; i < min (MAX_ZOMBIES, nzombies); i++)
     zombie_list = Fcons (zombies[i], zombie_list);
   args[0] = build_string ("%d GCs, avg live/zombies = %.2f/%.2f (%f%%), max %d/%d\nzombies: %S");
   args[1] = make_number (ngcs);
@@ -4410,7 +4410,7 @@ dump_zombies (void)
 {
   int i;
 
-  fprintf (stderr, "\nZombies kept alive = %"pI":\n", nzombies);
+  fprintf (stderr, "\nZombies kept alive = %"pI"d:\n", nzombies);
   for (i = 0; i < min (MAX_ZOMBIES, nzombies); ++i)
     {
       fprintf (stderr, "  %d = ", i);
diff --git a/src/bidi.c b/src/bidi.c
index e3fc03f4a9b..f06c146ca84 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -2127,7 +2127,7 @@ bidi_level_of_next_char (struct bidi_it *bidi_it)
       do {
         ch = bidi_fetch_char (bpos += clen, cpos += nc, &disp_pos, &dpp, &bs,
                               fwp, &clen, &nc);
-        if (ch == '\n' || ch == BIDI_EOB /* || ch == LINESEP_CHAR */)
+        if (ch == '\n' || ch == BIDI_EOB)
           chtype = NEUTRAL_B;
         else
           chtype = bidi_get_type (ch, NEUTRAL_DIR);
@@ -2177,7 +2177,6 @@ bidi_level_of_next_char (struct bidi_it *bidi_it)
   else if (bidi_it->orig_type == NEUTRAL_B /* L1 */
            || bidi_it->orig_type == NEUTRAL_S
            || bidi_it->ch == '\n' || bidi_it->ch == BIDI_EOB
-           /* || bidi_it->ch == LINESEP_CHAR */
            || (bidi_it->orig_type == NEUTRAL_WS
                && (bidi_it->next_for_ws.type == NEUTRAL_B
                    || bidi_it->next_for_ws.type == NEUTRAL_S)))
diff --git a/src/doc.c b/src/doc.c
index 83e943c42b8..80aaba9f7b2 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -116,14 +116,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;
       name = (char *) alloca (minsize + SCHARS (file) + 8);
-      strcpy (name, SSDATA (Vdoc_directory));
+      strcpy (name, SSDATA (docdir));
       strcat (name, SSDATA (file));
     }
   else
@@ -138,7 +140,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/lisp.h b/src/lisp.h
index 64c94647f0e..bc48b790a14 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2247,105 +2247,105 @@ struct gcpro
 
 #ifndef DEBUG_GCPRO
 
-#define GCPRO1_VAR(var, gcpro) \
- {gcpro##1.next = gcprolist; gcpro##1.var = &var; gcpro##1.nvars = 1; \
+#define GCPRO1_VAR(var1, gcpro) \
+ {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
   gcprolist = &gcpro##1; }
 
 #define GCPRO2_VAR(var1, var2, gcpro) \
- {gcpro##1.next = gcprolist; gcpro##1.var = &var1; gcpro##1.nvars = 1; \
-  gcpro##2.next = &gcpro##1; gcpro##2.var = &var2; gcpro##2.nvars = 1; \
+ {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
+  gcpro##2 .next = &gcpro##1; gcpro##2 .var = &var2; gcpro##2 .nvars = 1; \
   gcprolist = &gcpro##2; }
 
 #define GCPRO3_VAR(var1, var2, var3, gcpro) \
- {gcpro##1.next = gcprolist; gcpro##1.var = &var1; gcpro##1.nvars = 1; \
-  gcpro##2.next = &gcpro##1; gcpro##2.var = &var2; gcpro##2.nvars = 1; \
-  gcpro##3.next = &gcpro##2; gcpro##3.var = &var3; gcpro##3.nvars = 1; \
+ {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
+  gcpro##2 .next = &gcpro##1; gcpro##2 .var = &var2; gcpro##2 .nvars = 1; \
+  gcpro##3 .next = &gcpro##2; gcpro##3 .var = &var3; gcpro##3 .nvars = 1; \
   gcprolist = &gcpro##3; }
 
 #define GCPRO4_VAR(var1, var2, var3, var4, gcpro) \
- {gcpro##1.next = gcprolist; gcpro##1.var = &var1; gcpro##1.nvars = 1; \
-  gcpro##2.next = &gcpro##1; gcpro##2.var = &var2; gcpro##2.nvars = 1; \
-  gcpro##3.next = &gcpro##2; gcpro##3.var = &var3; gcpro##3.nvars = 1; \
-  gcpro##4.next = &gcpro##3; gcpro##4.var = &var4; gcpro##4.nvars = 1; \
+ {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
+  gcpro##2 .next = &gcpro##1; gcpro##2 .var = &var2; gcpro##2 .nvars = 1; \
+  gcpro##3 .next = &gcpro##2; gcpro##3 .var = &var3; gcpro##3 .nvars = 1; \
+  gcpro##4 .next = &gcpro##3; gcpro##4 .var = &var4; gcpro##4 .nvars = 1; \
   gcprolist = &gcpro##4; }
 
 #define GCPRO5_VAR(var1, var2, var3, var4, var5, gcpro) \
- {gcpro##1.next = gcprolist; gcpro##1.var = &var1; gcpro##1.nvars = 1; \
-  gcpro##2.next = &gcpro##1; gcpro##2.var = &var2; gcpro##2.nvars = 1; \
-  gcpro##3.next = &gcpro##2; gcpro##3.var = &var3; gcpro##3.nvars = 1; \
-  gcpro##4.next = &gcpro##3; gcpro##4.var = &var4; gcpro##4.nvars = 1; \
-  gcpro##5.next = &gcpro##4; gcpro##5.var = &var5; gcpro##5.nvars = 1; \
+ {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
+  gcpro##2 .next = &gcpro##1; gcpro##2 .var = &var2; gcpro##2 .nvars = 1; \
+  gcpro##3 .next = &gcpro##2; gcpro##3 .var = &var3; gcpro##3 .nvars = 1; \
+  gcpro##4 .next = &gcpro##3; gcpro##4 .var = &var4; gcpro##4 .nvars = 1; \
+  gcpro##5 .next = &gcpro##4; gcpro##5 .var = &var5; gcpro##5 .nvars = 1; \
   gcprolist = &gcpro##5; }
 
 #define GCPRO6_VAR(var1, var2, var3, var4, var5, var6, gcpro) \
- {gcpro##1.next = gcprolist; gcpro##1.var = &var1; gcpro##1.nvars = 1; \
-  gcpro##2.next = &gcpro##1; gcpro##2.var = &var2; gcpro##2.nvars = 1; \
-  gcpro##3.next = &gcpro##2; gcpro##3.var = &var3; gcpro##3.nvars = 1; \
-  gcpro##4.next = &gcpro##3; gcpro##4.var = &var4; gcpro##4.nvars = 1; \
-  gcpro##5.next = &gcpro##4; gcpro##5.var = &var5; gcpro##5.nvars = 1; \
-  gcpro##6.next = &gcpro##5; gcpro##6.var = &var6; gcpro##6.nvars = 1; \
+ {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
+  gcpro##2 .next = &gcpro##1; gcpro##2 .var = &var2; gcpro##2 .nvars = 1; \
+  gcpro##3 .next = &gcpro##2; gcpro##3 .var = &var3; gcpro##3 .nvars = 1; \
+  gcpro##4 .next = &gcpro##3; gcpro##4 .var = &var4; gcpro##4 .nvars = 1; \
+  gcpro##5 .next = &gcpro##4; gcpro##5 .var = &var5; gcpro##5 .nvars = 1; \
+  gcpro##6 .next = &gcpro##5; gcpro##6 .var = &var6; gcpro##6 .nvars = 1; \
   gcprolist = &gcpro##6; }
 
-#define UNGCPRO_VAR(gcpro) (gcprolist = gcpro##1.next)
+#define UNGCPRO_VAR(gcpro) (gcprolist = gcpro##1 .next)
 
 #else
 
 extern int gcpro_level;
 
-#define GCPRO1_VAR(var, gcpro) \
- {gcpro##1.next = gcprolist; gcpro##1.var = &var; gcpro##1.nvars = 1; \
-  gcpro##1.level = gcpro_level++; \
+#define GCPRO1_VAR(var1, gcpro) \
+ {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
+  gcpro##1 .level = gcpro_level++; \
   gcprolist = &gcpro##1; }
 
 #define GCPRO2_VAR(var1, var2, gcpro) \
- {gcpro##1.next = gcprolist; gcpro##1.var = &var1; gcpro##1.nvars = 1; \
-  gcpro##1.level = gcpro_level; \
-  gcpro##2.next = &gcpro##1; gcpro##2.var = &var2; gcpro##2.nvars = 1; \
-  gcpro##2.level = gcpro_level++; \
+ {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
+  gcpro##1 .level = gcpro_level; \
+  gcpro##2 .next = &gcpro##1; gcpro##2 .var = &var2; gcpro##2 .nvars = 1; \
+  gcpro##2 .level = gcpro_level++; \
   gcprolist = &gcpro##2; }
 
 #define GCPRO3_VAR(var1, var2, var3, gcpro) \
- {gcpro##1.next = gcprolist; gcpro##1.var = &var1; gcpro##1.nvars = 1; \
-  gcpro##1.level = gcpro_level; \
-  gcpro##2.next = &gcpro##1; gcpro##2.var = &var2; gcpro##2.nvars = 1; \
-  gcpro##3.next = &gcpro##2; gcpro##3.var = &var3; gcpro##3.nvars = 1; \
-  gcpro##3.level = gcpro_level++; \
+ {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
+  gcpro##1 .level = gcpro_level; \
+  gcpro##2 .next = &gcpro##1; gcpro##2 .var = &var2; gcpro##2 .nvars = 1; \
+  gcpro##3 .next = &gcpro##2; gcpro##3 .var = &var3; gcpro##3 .nvars = 1; \
+  gcpro##3 .level = gcpro_level++; \
   gcprolist = &gcpro##3; }
 
 #define GCPRO4_VAR(var1, var2, var3, var4, gcpro) \
- {gcpro##1.next = gcprolist; gcpro##1.var = &var1; gcpro##1.nvars = 1; \
-  gcpro##1.level = gcpro_level; \
-  gcpro##2.next = &gcpro##1; gcpro##2.var = &var2; gcpro##2.nvars = 1; \
-  gcpro##3.next = &gcpro##2; gcpro##3.var = &var3; gcpro##3.nvars = 1; \
-  gcpro##4.next = &gcpro##3; gcpro##4.var = &var4; gcpro##4.nvars = 1; \
-  gcpro##4.level = gcpro_level++; \
+ {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
+  gcpro##1 .level = gcpro_level; \
+  gcpro##2 .next = &gcpro##1; gcpro##2 .var = &var2; gcpro##2 .nvars = 1; \
+  gcpro##3 .next = &gcpro##2; gcpro##3 .var = &var3; gcpro##3 .nvars = 1; \
+  gcpro##4 .next = &gcpro##3; gcpro##4 .var = &var4; gcpro##4 .nvars = 1; \
+  gcpro##4 .level = gcpro_level++; \
   gcprolist = &gcpro##4; }
 
 #define GCPRO5_VAR(var1, var2, var3, var4, var5, gcpro) \
- {gcpro##1.next = gcprolist; gcpro##1.var = &var1; gcpro##1.nvars = 1; \
-  gcpro##1.level = gcpro_level; \
-  gcpro##2.next = &gcpro##1; gcpro##2.var = &var2; gcpro##2.nvars = 1; \
-  gcpro##3.next = &gcpro##2; gcpro##3.var = &var3; gcpro##3.nvars = 1; \
-  gcpro##4.next = &gcpro##3; gcpro##4.var = &var4; gcpro##4.nvars = 1; \
-  gcpro##5.next = &gcpro##4; gcpro##5.var = &var5; gcpro##5.nvars = 1; \
-  gcpro##5.level = gcpro_level++; \
+ {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
+  gcpro##1 .level = gcpro_level; \
+  gcpro##2 .next = &gcpro##1; gcpro##2 .var = &var2; gcpro##2 .nvars = 1; \
+  gcpro##3 .next = &gcpro##2; gcpro##3 .var = &var3; gcpro##3 .nvars = 1; \
+  gcpro##4 .next = &gcpro##3; gcpro##4 .var = &var4; gcpro##4 .nvars = 1; \
+  gcpro##5 .next = &gcpro##4; gcpro##5 .var = &var5; gcpro##5 .nvars = 1; \
+  gcpro##5 .level = gcpro_level++; \
   gcprolist = &gcpro##5; }
 
 #define GCPRO6_VAR(var1, var2, var3, var4, var5, var6, gcpro) \
- {gcpro##1.next = gcprolist; gcpro##1.var = &var1; gcpro##1.nvars = 1; \
-  gcpro##1.level = gcpro_level; \
-  gcpro##2.next = &gcpro##1; gcpro##2.var = &var2; gcpro##2.nvars = 1; \
-  gcpro##3.next = &gcpro##2; gcpro##3.var = &var3; gcpro##3.nvars = 1; \
-  gcpro##4.next = &gcpro##3; gcpro##4.var = &var4; gcpro##4.nvars = 1; \
-  gcpro##5.next = &gcpro##4; gcpro##5.var = &var5; gcpro##5.nvars = 1; \
-  gcpro##6.next = &gcpro##5; gcpro##6.var = &var6; gcpro##6.nvars = 1; \
-  gcpro##6.level = gcpro_level++; \
+ {gcpro##1 .next = gcprolist; gcpro##1 .var = &var1; gcpro##1 .nvars = 1; \
+  gcpro##1 .level = gcpro_level; \
+  gcpro##2 .next = &gcpro##1; gcpro##2 .var = &var2; gcpro##2 .nvars = 1; \
+  gcpro##3 .next = &gcpro##2; gcpro##3 .var = &var3; gcpro##3 .nvars = 1; \
+  gcpro##4 .next = &gcpro##3; gcpro##4 .var = &var4; gcpro##4 .nvars = 1; \
+  gcpro##5 .next = &gcpro##4; gcpro##5 .var = &var5; gcpro##5 .nvars = 1; \
+  gcpro##6 .next = &gcpro##5; gcpro##6 .var = &var6; gcpro##6 .nvars = 1; \
+  gcpro##6 .level = gcpro_level++; \
   gcprolist = &gcpro##6; }
 
 #define UNGCPRO_VAR(gcpro) \
- ((--gcpro_level != gcpro##1.level) \
+ ((--gcpro_level != gcpro##1 .level) \
   ? (abort (), 0) \
-  : ((gcprolist = gcpro##1.next), 0))
+  : ((gcprolist = gcpro##1 .next), 0))
 
 #endif /* DEBUG_GCPRO */
 #endif /* GC_MARK_STACK != GC_MAKE_GCPROS_NOOPS */
diff --git a/src/lread.c b/src/lread.c
index af737d27070..110f3e62f71 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -2210,7 +2210,7 @@ read_escape (Lisp_Object readcharfun, int stringp)
     case 'x':
       /* A hex escape, as in ANSI C.  */
       {
-        int i = 0;
+        unsigned int i = 0;
         int count = 0;
         while (1)
           {
@@ -2234,7 +2234,9 @@ read_escape (Lisp_Object readcharfun, int stringp)
                 UNREAD (c);
                 break;
               }
-            if (MAX_CHAR < i)
+            /* Allow hex escapes as large as ?\xfffffff, because some
+               packages use them to denote characters with modifiers.  */
+            if ((CHAR_META | (CHAR_META - 1)) < i)
               error ("Hex character out of range: \\x%x...", i);
             count += count < 3;
           }
diff --git a/src/minibuf.c b/src/minibuf.c
index f082cc01d97..a44a6376472 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1859,9 +1859,10 @@ The arguments STRING and PREDICATE are as in `try-completion',
           /* First, look for a non-internal buffer in `res'.  */
           while (CONSP (bufs) && SREF (XCAR (bufs), 0) == ' ')
             bufs = XCDR (bufs);
-          if (NILP (bufs) && EQ (Flength (res), Flength (Vbuffer_alist)))
-            /* All bufs are internal, so don't trip them out.  */
-            return res;
+          if (NILP (bufs))
+            return (EQ (Flength (res), Flength (Vbuffer_alist))
+                    /* If all bufs are internal don't strip them out.  */
+                    ? res : bufs);
           res = bufs;
           while (CONSP (XCDR (bufs)))
             if (SREF (XCAR (XCDR (bufs)), 0) == ' ')
diff --git a/src/xdisp.c b/src/xdisp.c
index 9ec7463c555..09de9e4b539 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7189,7 +7189,6 @@ get_visually_first_element (struct it *it)
     }
   else if (it->bidi_it.charpos == bob
            || (!string_p
-               /* FIXME: Should support all Unicode line separators.  */
                && (FETCH_CHAR (it->bidi_it.bytepos - 1) == '\n'
                    || FETCH_CHAR (it->bidi_it.bytepos) == '\n')))
     {
@@ -13935,27 +13934,9 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
               glyph--;
             }
         }
-      else if (match_with_avoid_cursor
-               /* 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.  But if a display string
-                  covers point, defer to the string-handling code
-                  below to figure this out.  */
-               || (!string_seen
-                   && ((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)))))
-        {
-          if (!match_with_avoid_cursor
-              && row->truncated_on_left_p && pt_old < bpos_min)
-            cursor = glyph_before;
-          else
-            cursor = glyph_after;
+      else if (match_with_avoid_cursor)
+        {
+          cursor = glyph_after;
           x = -1;
         }
       else if (string_seen)
@@ -14094,6 +14075,26 @@ set_cursor_from_row (struct window *w, struct glyph_row *row,
               && row->continued_p)
             return 0;
         }
+      /* 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.  But if a
+         display string covers point, defer to the string-handling
+         code below to figure this out.  */
+      else if (row->truncated_on_left_p && pt_old < bpos_min)
+        {
+          cursor = glyph_before;
+          x = -1;
+        }
+      else if ((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;
+        }
     }
 
  compute_x:
@@ -18750,7 +18751,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
             {
@@ -18766,7 +18772,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
@@ -19583,6 +19589,7 @@ See also `bidi-paragraph-direction'.  */)
             bytepos--;
         }
       bidi_init_it (pos, bytepos, FRAME_WINDOW_P (SELECTED_FRAME ()), &itb);
+      itb.paragraph_dir = NEUTRAL_DIR;
       itb.string.s = NULL;
       itb.string.lstring = Qnil;
       itb.string.bufpos = 0;