[Emacs-diffs] /srv/bzr/emacs/trunk r105553: Fix current-bidi-paragraph-direction and its doc.

[Eli Zaretskii]

------------------------------------------------------------
revno: 105553
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2011-08-24 14:49:54 +0300
message:
  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.
modified:
  doc/lispref/ChangeLog
  doc/lispref/display.texi
  src/ChangeLog
  src/xdisp.c

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2011-08-23 14:45:14 +0000
+++ b/doc/lispref/ChangeLog     2011-08-24 11:49:54 +0000
@@ -1,3 +1,9 @@
+2011-08-24  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * nonascii.texi (Character Properties): Document the values for

=== modified file 'doc/lispref/display.texi'
--- a/doc/lispref/display.texi  2011-08-18 16:27:59 +0000
+++ b/doc/lispref/display.texi  2011-08-24 11:49:54 +0000
@@ -6104,7 +6104,9 @@
 buffer-local value of the variable @code{bidi-paragraph-direction} is
 address@hidden, 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
address@hidden 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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-08-24 07:46:00 +0000
+++ b/src/ChangeLog     2011-08-24 11:49:54 +0000
@@ -1,5 +1,8 @@
 2011-08-24  Eli Zaretskii  <address@hidden>
 
+       * 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.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-08-23 10:35:47 +0000
+++ b/src/xdisp.c       2011-08-24 11:49:54 +0000
@@ -19014,7 +19014,8 @@
       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);