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.

diff --git a/src/ChangeLog b/src/ChangeLog
index c164c6b5f58b6610ea355d4242057073658a8c55..4c564d214de6ad017905b93cdbdbd031246c61b4 100644 (file)
--- 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 2b032bd6597e00e107cd6b0419022e46c96bcb1f..1cf58edc4c643cafb5558c705bb2dc20b7dbe81c 100644 (file)
--- 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