Mercurial > emacs

changeset 29191:3977c8167022

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(handle_invisible_prop): Don't try to skip over invisible text if end of text is already reached.
author Gerd Moellmann <gerd@gnu.org>
date Thu, 25 May 2000 15:53:05 +0000
parents f0d6f1a9c9ae
children 42feade9d5aa
files src/xdisp.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/xdisp.c	Thu May 25 15:47:07 2000 +0000
+++ b/src/xdisp.c	Thu May 25 15:53:05 2000 +0000
@@ -2046,7 +2046,8 @@
       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 @@
       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.  */