mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-21 18:23:59 +00:00
(skip_invisible): Fix my brain fart.
This commit is contained in:
parent
0a5cb0d45e
commit
662152ddd2
14
src/indent.c
14
src/indent.c
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user