summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2000-05-25 15:53:05 +0000
committerGerd Moellmann <gerd@gnu.org>2000-05-25 15:53:05 +0000
commiteadc0bf89c04df826c96ebff62fb2a73fe6d11c3 (patch)
tree90b9a46e328f6fb181876608190e1d300792b0f7
parent14028d571b4058de7320aac9c69029944689e6f2 (diff)
downloademacs-eadc0bf89c04df826c96ebff62fb2a73fe6d11c3.tar.gz
emacs-eadc0bf89c04df826c96ebff62fb2a73fe6d11c3.tar.bz2
emacs-eadc0bf89c04df826c96ebff62fb2a73fe6d11c3.zip
(handle_invisible_prop): Don't try to skip over
invisible text if end of text is already reached.
-rw-r--r--src/xdisp.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index fef2b9429c8..0171f963f34 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2046,7 +2046,8 @@ handle_invisible_prop (it)
XSETFASTINT (charpos, IT_STRING_CHARPOS (*it));
prop = Fget_text_property (charpos, Qinvisible, it->string);
- if (!NILP (prop))
+ if (!NILP (prop)
+ && IT_STRING_CHARPOS (*it) < it->end_charpos)
{
handled = HANDLED_RECOMPUTE_PROPS;
@@ -2100,7 +2101,8 @@ handle_invisible_prop (it)
prop = Fget_char_property (pos, Qinvisible, it->window);
/* If we are on invisible text, skip over it. */
- if (TEXT_PROP_MEANS_INVISIBLE (prop))
+ if (TEXT_PROP_MEANS_INVISIBLE (prop)
+ && IT_CHARPOS (*it) < it->end_charpos)
{
/* Record whether we have to display an ellipsis for the
invisible text. */