thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.1.0617: Cursor moves beyond first line of folded end of buffer

Browse Source 
Problem:  Cursor moves beyond start of a folded range at the end of a buffer.
Solution: Move cursor to start of fold when going beyond end of buffer.
          Check that cursor moved to detect FAIL in outer cursor function.
          (Luuk van Baal)

closes: #15344

Signed-off-by: Luuk van Baal <luukvbaal@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Luuk van Baal
2024-07-25 21:24:32 +02:00
committed by Christian Brabandt
parent eb4b903c9b
commit dc373d456b
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/edit.c
View File

@@ -2849,7 +2849,6 @@ cursor_down_inner(win_T *wp, long n)
// count each sequence of folded lines as one logical line
while (n--)
{
// Move to last line of fold, will fail if it's the end-of-file.
if (hasFoldingWin(wp, lnum, NULL, &last, TRUE, NULL))
lnum = last + 1;
else
@@ -2877,8 +2876,11 @@ cursor_down(
{
linenr_T lnum = curwin->w_cursor.lnum;
linenr_T line_count = curwin->w_buffer->b_ml.ml_line_count;
// This fails if the cursor is already in the last line or would move
// beyond the last line and '-' is in 'cpoptions'
// This fails if the cursor is already in the last (folded) line, or would
// move beyond the last line and '-' is in 'cpoptions'.
#ifdef FEAT_FOLDING
hasFoldingWin(curwin, lnum, NULL, &lnum, TRUE, NULL);
#endif
if (n > 0
&& (lnum >= line_count
|| (lnum + n > line_count