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.

diff --cc src/ChangeLog
index 211625ee4467bdcbb69f60c1da38bcdb6bbdc4f3,4c564d214de6ad017905b93cdbdbd031246c61b4..d2c95aee4c462a1223afce0d4b6c47383b398821
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,24 -1,8 +1,29 @@@
+ 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.
 +      (Bug#8437)
 +      * keyboard.c (parse_tool_bar_item): Likewise.
 +      * sound.c (sound_cleanup, alsa_close): Likewise.
 +      * termcap.c (tgetent): Likewise.
 +      * xfns.c (x_default_font_parameter): Likewise.
 +      * xsettings.c (read_and_apply_settings): Likewise.
 +
 +      * alloc.c (overrun_check_malloc, overrun_check_realloc)
 +      (overrun_check_free): Protoize.
 +
 +2011-04-12  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * sysdep.c (emacs_read, emacs_write): Check for negative sizes
 +      since callers should never pass a negative size.
 +      Change the signature to match that of plain 'read' and 'write'; see
 +      <http://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00397.html>.
 +      * lisp.h: Update prototypes of emacs_write and emacs_read.
 +
  2011-04-11  Eli Zaretskii  <eliz@gnu.org>
  
        * xdisp.c (redisplay_window): Don't try to determine the character

diff --cc src/xdisp.c
Simple merge