Fix bug #8487 with invisible text at EOB under bidi.

 src/xdisp.c (handle_invisible_prop): Don't call bidi_paragraph_init
 when at ZV.

2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 211625ee446..d2c95aee4c4 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-12  Andreas Schwab  <schwab@linux-m68k.org>
 
         * charset.c (Fclear_charset_maps): Use xfree instead of free.
diff --git a/src/xdisp.c b/src/xdisp.c
index fc9771b6a7e..2a6e85732c0 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3660,7 +3660,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