Fix current-bidi-paragraph-direction and its doc.

 src/xdisp.c (Fcurrent_bidi_paragraph_direction): For unibyte
 buffers, return left-to-right.
 doc/lispref/display.texi (Bidirectional Display): Document return value in
 buffers that are not bidi-reordered for display, and in unibyte
 buffers.

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 43add469ec0168312ecb4ff9a9cf6d747b4fb26d..4bf615328b19695cac537e933287673bacc70ec7 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-24  Eli Zaretskii  <eliz@gnu.org>
+
+       * display.texi (Bidirectional Display): Document return value in
+       buffers that are not bidi-reordered for display, and in unibyte
+       buffers.
+
 2011-08-23  Eli Zaretskii  <eliz@gnu.org>
 
        * nonascii.texi (Character Properties): Document the values for

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 8f7f40034114cc95e45d76db7b0c9c8b3dd2cfb1..0593eba8f05bc3e0560e5d03d8b6916c076accc4 100644 (file)
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -6104,7 +6104,9 @@ omitted or @code{nil}, it defaults to the current buffer.  If the
 buffer-local value of the variable @code{bidi-paragraph-direction} is
 non-@code{nil}, the returned value will be identical to that value;
 otherwise, the returned value reflects the paragraph direction
-determined dynamically by Emacs.
+determined dynamically by Emacs.  For buffers whose value of
+@code{bidi-display-reordering} is @code{nil} as well as unibyte
+buffers, this function always returns @code{left-to-right}.
 @end defun
 
 @cindex layout on display, and bidirectional text

diff --git a/src/ChangeLog b/src/ChangeLog
index f52e8cad479d52df6e2b15ea799bf0ad78d65fe2..d4d6a4c4bbd49b275a76779c80bb86e256f78d40 100644 (file)
--- 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 6a11628f858814d3d863a54d7e2ac12084dc5eef..8b3a71027b6000723ba49c92e33831a27f40a282 100644 (file)
--- 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);