diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-04-13 20:41:04 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-04-13 20:41:04 +0300 |
| commit | a6744a352fc06e9a303264d64a904596475fe2d1 (patch) | |
| tree | 684a807bee727922db191272d50c8f10c0436005 | |
| parent | 11997c7643812a3a6f95da1c65c46d1c0307e2a7 (diff) | |
| download | emacs-a6744a352fc06e9a303264d64a904596475fe2d1.tar.gz | |
Fix bug #8487 with invisible property near EOB under bidi.
src/xdisp.c (handle_invisible_prop): Don't call bidi_paragraph_init
when at ZV.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c164c6b5f58..4c564d214de 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-04-13 Eli Zaretskii <eliz@gnu.org> + + * xdisp.c (handle_invisible_prop): Don't call bidi_paragraph_init + when at ZV. (Bug#8487) + 2011-04-11 Eli Zaretskii <eliz@gnu.org> * xdisp.c (redisplay_window): Don't try to determine the character diff --git a/src/xdisp.c b/src/xdisp.c index 2b032bd6597..1cf58edc4c6 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -3661,7 +3661,7 @@ handle_invisible_prop (struct it *it) _after_ bidi iteration avoids affecting the visual order of the displayed text when invisible properties are added or removed. */ - if (it->bidi_it.first_elt) + if (it->bidi_it.first_elt && it->bidi_it.charpos < ZV) { /* If we were `reseat'ed to a new paragraph, determine the paragraph base direction. We need |