(handle_fontified_prop): Don't fontify at EOB.

2 files changed, 7 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f68f2453bd1..c62e4fbe031 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xdisp.c (handle_fontified_prop): Don't fontify at EOB.
+
 2006-09-30  Eli Zaretskii  <eliz@gnu.org>
 
         * config.in Regenerated.
diff --git a/src/xdisp.c b/src/xdisp.c
index c766f714335..a8da5aa848e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3246,7 +3246,9 @@ handle_fontified_prop (it)
       && !NILP (Vrun_hooks)
       && (pos = make_number (IT_CHARPOS (*it)),
           prop = Fget_char_property (pos, Qfontified, Qnil),
-          NILP (prop)))
+          /* Ignore the special cased nil value always present at EOB since
+             no amount of fontifying will be able to change it.  */
+          NILP (prop) && IT_CHARPOS (*it) < Z))
     {
       int count = SPECPDL_INDEX ();
       Lisp_Object val;