Mercurial > emacs
changeset 109779:d2d95919c4db
Fix current-bidi-paragraph-direction within whitespace chars.
xdisp.c (Fcurrent_bidi_paragraph_direction): Fix paragraph
direction when point is inside a run of whitespace characters.
bidi.c (bidi_at_paragraph_end): Remove obsolete comment.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Sat, 14 Aug 2010 13:59:55 +0300 |
| parents | e253995f955c |
| children | 300a489dd304 |
| files | src/ChangeLog src/bidi.c src/xdisp.c |
| diffstat | 3 files changed, 16 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Aug 14 10:50:20 2010 +0000 +++ b/src/ChangeLog Sat Aug 14 13:59:55 2010 +0300 @@ -1,3 +1,10 @@ +2010-08-14 Eli Zaretskii <eliz@gnu.org> + + * xdisp.c (Fcurrent_bidi_paragraph_direction): Fix paragraph + direction when point is inside a run of whitespace characters. + + * bidi.c (bidi_at_paragraph_end): Remove obsolete comment. + 2010-08-14 Jason Rumney <jasonr@gnu.org> * keyboard.c (lispy_function_keys): Do not define VK_PACKET (bug#4836)
--- a/src/bidi.c Sat Aug 14 10:50:20 2010 +0000 +++ b/src/bidi.c Sat Aug 14 13:59:55 2010 +0300 @@ -497,7 +497,6 @@ static EMACS_INT bidi_at_paragraph_end (EMACS_INT charpos, EMACS_INT bytepos) { - /* FIXME: Why Fbuffer_local_value rather than just Fsymbol_value? */ Lisp_Object sep_re; Lisp_Object start_re; EMACS_INT val;
--- a/src/xdisp.c Sat Aug 14 10:50:20 2010 +0000 +++ b/src/xdisp.c Sat Aug 14 13:59:55 2010 +0300 @@ -17962,16 +17962,22 @@ struct bidi_it itb; EMACS_INT pos = BUF_PT (buf); EMACS_INT bytepos = BUF_PT_BYTE (buf); + int c; if (buf != current_buffer) set_buffer_temp (buf); - /* Find previous non-empty line. */ + /* bidi_paragraph_init finds the base direction of the paragraph + by searching forward from paragraph start. We need the base + direction of the current or _previous_ paragraph, so we need + to make sure we are within that paragraph. To that end, find + the previous non-empty line. */ if (pos >= ZV && pos > BEGV) { pos--; bytepos = CHAR_TO_BYTE (pos); } - while (FETCH_BYTE (bytepos) == '\n') + while ((c = FETCH_BYTE (bytepos)) == '\n' + || c == ' ' || c == '\t' || c == '\f') { if (bytepos <= BEGV_BYTE) break; @@ -17983,6 +17989,7 @@ itb.charpos = pos; itb.bytepos = bytepos; itb.first_elt = 1; + itb.separator_limit = -1; bidi_paragraph_init (NEUTRAL_DIR, &itb); if (buf != current_buffer)