procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix return value of vertical-motion at ZV (Bug#19553)

Browse source 
src/indent.c (Fvertical_motion): Return zero if we started from ZV
 and there's an overlay after-string there.
This commit is contained in:
Eli Zaretskii 2015-01-10 15:03:51 +02:00
parent 1f179ea1ba
commit b544ab561f
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2015-01-10 Eli Zaretskii <eliz@gnu.org>
* indent.c (Fvertical_motion): Return zero if we started from ZV
and there's an overlay after-string there. (Bug#19553)
2015-01-09 Eli Zaretskii <eliz@gnu.org> 2015-01-09 Eli Zaretskii <eliz@gnu.org>
* emacs.c (usage_message): Fix the description of the -nl switch. * emacs.c (usage_message): Fix the description of the -nl switch.

7
src/indent.c
View file

@ -2137,10 +2137,15 @@ whether or not it is currently displayed in some window. */)
if (nlines > 1) if (nlines > 1)
move_it_by_lines (&it, min (PTRDIFF_MAX, nlines - 1)); move_it_by_lines (&it, min (PTRDIFF_MAX, nlines - 1));
} }
else else /* it_start = ZV */
{ {
it.vpos = 0; it.vpos = 0;
move_it_by_lines (&it, min (PTRDIFF_MAX, nlines)); move_it_by_lines (&it, min (PTRDIFF_MAX, nlines));
/* We could have some display or overlay string at ZV,
in which case it.vpos will be nonzero now, while
actually we didn't move vertically at all. */
if (IT_CHARPOS (it) == CHARPOS (pt) && CHARPOS (pt) == it_start)
it.vpos = 0;
} }
} }