aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2011-08-24 14:49:54 +0300
committerEli Zaretskii2011-08-24 14:49:54 +0300
commit5980d4c6db923da523fbb0e2fb44ecd68b13c53d (patch)
tree8ff36b595125112f39ea288dab1de68a1393e5bb /src
parent11dcdbb283eb9efddf73939d3c3d12404731833f (diff)
downloademacs-5980d4c6db923da523fbb0e2fb44ecd68b13c53d.tar.gz
emacs-5980d4c6db923da523fbb0e2fb44ecd68b13c53d.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/xdisp.c3
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 @@
12011-08-24 Eli Zaretskii <eliz@gnu.org> 12011-08-24 Eli Zaretskii <eliz@gnu.org>
2 2
3 * xdisp.c (Fcurrent_bidi_paragraph_direction): For unibyte
4 buffers, return left-to-right.
5
3 * bidi.c (bidi_check_type): Use xassert. 6 * bidi.c (bidi_check_type): Use xassert.
4 (bidi_cache_iterator_state): Update the disp_pos and disp_prop_p 7 (bidi_cache_iterator_state): Update the disp_pos and disp_prop_p
5 members. 8 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'. */)
19014 buf = XBUFFER (buffer); 19014 buf = XBUFFER (buffer);
19015 } 19015 }
19016 19016
19017 if (NILP (BVAR (buf, bidi_display_reordering))) 19017 if (NILP (BVAR (buf, bidi_display_reordering))
19018 || NILP (BVAR (buf, enable_multibyte_characters)))
19018 return Qleft_to_right; 19019 return Qleft_to_right;
19019 else if (!NILP (BVAR (buf, bidi_paragraph_direction))) 19020 else if (!NILP (BVAR (buf, bidi_paragraph_direction)))
19020 return BVAR (buf, bidi_paragraph_direction); 19021 return BVAR (buf, bidi_paragraph_direction);