aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-17 07:44:28 -04:00
Code Activity

patch 9.0.1324: "gj" and "gk" do not move correctly over a closed fold

Browse Source 
Problem:    "gj" and "gk" do not move correctly over a closed fold.
Solution:   Use the same code as used for "j"/"k" to go to the next/previous
            line. (Luuk van Baal, closes #12007)
This commit is contained in:
Luuk van Baal
2023-02-18 20:15:44 +00:00
committed by Bram Moolenaar
parent 3e1ac1443a
commit 441a7a9448
3 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/normal.c
View File

@@ -2344,20 +2344,11 @@ nv_screengo(oparg_T *oap, int dir, long dist)
else
{
// to previous line
#ifdef FEAT_FOLDING
// Move to the start of a closed fold. Don't do that when
// 'foldopen' contains "all": it will open in a moment.
if (!(fdo_flags & FDO_ALL))
(void)hasFolding(curwin->w_cursor.lnum,
&curwin->w_cursor.lnum, NULL);
#endif
if (curwin->w_cursor.lnum == 1)
if (!cursor_up_inner(curwin, 1))
{
retval = FAIL;
break;
}
--curwin->w_cursor.lnum;
linelen = linetabsize_str(ml_get_curline());
if (linelen > width1)
curwin->w_curswant += (((linelen - width1 - 1) / width2)
@@ -2380,17 +2371,11 @@ nv_screengo(oparg_T *oap, int dir, long dist)
else
{
// to next line
#ifdef FEAT_FOLDING
// Move to the end of a closed fold.
(void)hasFolding(curwin->w_cursor.lnum, NULL,
&curwin->w_cursor.lnum);
#endif
if (curwin->w_cursor.lnum == curbuf->b_ml.ml_line_count)
if (!cursor_down_inner(curwin, 1))
{
retval = FAIL;
break;
}
curwin->w_cursor.lnum++;
curwin->w_curswant %= width2;
// Check if the cursor has moved below the number display
// when width1 < width2 (with cpoptions+=n). Subtract width2