2 files changed, 5 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f52e8cad479..d4d6a4c4bbd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-08-24  Eli Zaretskii  <eliz@gnu.org>
 
+        * xdisp.c (Fcurrent_bidi_paragraph_direction): For unibyte
+        buffers, return left-to-right.
+
         * bidi.c (bidi_check_type): Use xassert.
         (bidi_cache_iterator_state): Update the disp_pos and disp_prop_p
         members.
diff --git a/src/xdisp.c b/src/xdisp.c
index 6a11628f858..8b3a71027b6 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -19014,7 +19014,8 @@ See also `bidi-paragraph-direction'.  */)
       buf = XBUFFER (buffer);
     }
 
-  if (NILP (BVAR (buf, bidi_display_reordering)))
+  if (NILP (BVAR (buf, bidi_display_reordering))
+      || NILP (BVAR (buf, enable_multibyte_characters)))
     return Qleft_to_right;
   else if (!NILP (BVAR (buf, bidi_paragraph_direction)))
     return BVAR (buf, bidi_paragraph_direction);