aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.2.2711: "gj" in a closed fold does not move out of the fold

Browse Source 
Problem:    "gj" in a closed fold does not move out of the fold. (Marco Hinz)
Solution:   Add a check for being in a closed fold. (closes #8062)
This commit is contained in:
Bram Moolenaar
2021-04-04 21:26:04 +02:00
parent 90193e6140
commit 3c49e74e18
3 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/normal.c
View File

@@ -2564,7 +2564,11 @@ nv_screengo(oparg_T *oap, int dir, long dist)
{
if (dir == BACKWARD)
{
if ((long)curwin->w_curswant >= width1)
if ((long)curwin->w_curswant >= width1
#ifdef FEAT_FOLDING
&& !hasFolding(curwin->w_cursor.lnum, NULL, NULL)
#endif
)
// Move back within the line. This can give a negative value
// for w_curswant if width1 < width2 (with cpoptions+=n),
// which will get clipped to column 0.
@@ -2598,7 +2602,11 @@ nv_screengo(oparg_T *oap, int dir, long dist)
n = ((linelen - width1 - 1) / width2 + 1) * width2 + width1;
else
n = width1;
if (curwin->w_curswant + width2 < (colnr_T)n)
if (curwin->w_curswant + width2 < (colnr_T)n
#ifdef FEAT_FOLDING
&& !hasFolding(curwin->w_cursor.lnum, NULL, NULL)
#endif
)
// move forward within line
curwin->w_curswant += width2;
else