mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-30 00:51:50 -08:00
Code Issues Projects Releases Wiki Activity

(skip_invisible): Fix my brain fart.

Browse source
This commit is contained in:
Stefan Monnier 2002-03-05 18:56:16 +00:00
parent 0a5cb0d45e
commit 662152ddd2
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/indent.c
View file

@ -221,7 +221,7 @@ skip_invisible (pos, next_boundary_p, to, window)
{
Lisp_Object prop, position, overlay_limit, proplimit;
Lisp_Object buffer;
int end;
int end, inv_p;
XSETFASTINT (position, pos);
XSETBUFFER (buffer, current_buffer);
@ -266,11 +266,13 @@ skip_invisible (pos, next_boundary_p, to, window)
}
/* if the `invisible' property is set, we can skip to
the next property change */
if (!NILP (window) && EQ (XWINDOW (window)->buffer, buffer))
prop = Fget_char_property (position, Qinvisible, window);
else
prop = Fget_char_property (position, Qinvisible, buffer);
if (TEXT_PROP_MEANS_INVISIBLE (prop) > NILP (window))
prop = Fget_char_property (position, Qinvisible,
(!NILP (window)
&& EQ (XWINDOW (window)->buffer, buffer))
? window : buffer);
inv_p = TEXT_PROP_MEANS_INVISIBLE (prop);
/* When counting columns (window == nil), don't skip over ellipsis text. */
if (NILP (window) ? inv_p == 1 : inv_p)
return *next_boundary_p;
return pos;
}