patch 8.2.2385: "gj" and "gk" do not work correctly when inside a fold

Problem:    "gj" and "gk" do not work correctly when inside a fold.
Solution:   Move check for folding. (closes #7724, closes #4095)

diff --git a/src/normal.c b/src/normal.c
index a5f5794c528bdc90dade862046f40abbdd9cdff6..c70971f8e98fee6cac79b7f1b8c8d777c23d1476 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -2570,12 +2570,6 @@ nv_screengo(oparg_T *oap, int dir, long dist)
            else
            {
                // to previous line
-               if (curwin->w_cursor.lnum == 1)
-               {
-                   retval = FAIL;
-                   break;
-               }
-               --curwin->w_cursor.lnum;
 #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.
@@ -2583,6 +2577,13 @@ nv_screengo(oparg_T *oap, int dir, long dist)
                    (void)hasFolding(curwin->w_cursor.lnum,
                                                &curwin->w_cursor.lnum, NULL);
 #endif
+               if (curwin->w_cursor.lnum == 1)
+               {
+                   retval = FAIL;
+                   break;
+               }
+               --curwin->w_cursor.lnum;
+
                linelen = linetabsize(ml_get_curline());
                if (linelen > width1)
                    curwin->w_curswant += (((linelen - width1 - 1) / width2)
@@ -5957,13 +5958,8 @@ nv_g_cmd(cmdarg_T *cap)
      */
     case 'j':
     case K_DOWN:
-       // with 'nowrap' it works just like the normal "j" command; also when
-       // in a closed fold
-       if (!curwin->w_p_wrap
-#ifdef FEAT_FOLDING
-               || hasFolding(curwin->w_cursor.lnum, NULL, NULL)
-#endif
-               )
+       // with 'nowrap' it works just like the normal "j" command.
+       if (!curwin->w_p_wrap)
        {
            oap->motion_type = MLINE;
            i = cursor_down(cap->count1, oap->op_type == OP_NOP);
@@ -5976,13 +5972,8 @@ nv_g_cmd(cmdarg_T *cap)
 
     case 'k':
     case K_UP:
-       // with 'nowrap' it works just like the normal "k" command; also when
-       // in a closed fold
-       if (!curwin->w_p_wrap
-#ifdef FEAT_FOLDING
-               || hasFolding(curwin->w_cursor.lnum, NULL, NULL)
-#endif
-          )
+       // with 'nowrap' it works just like the normal "k" command.
+       if (!curwin->w_p_wrap)
        {
            oap->motion_type = MLINE;
            i = cursor_up(cap->count1, oap->op_type == OP_NOP);

diff --git a/src/testdir/test_fold.vim b/src/testdir/test_fold.vim
index b978fc080faad37da334a1741cc0a1fde5cfc4a3..895a96b1270fe0469ae51456bfe2724ae60a0171 100644 (file)
--- a/src/testdir/test_fold.vim
+++ b/src/testdir/test_fold.vim
@@ -859,4 +859,39 @@ func Test_fold_create_delete()
   bwipe!
 endfunc
 
+func Test_fold_relative_move()
+  enew!
+  set fdm=indent sw=2 wrap tw=80
+
+  let content = [ '  foo', '  bar', '  baz',
+              \   repeat('x', 100),
+              \   '  foo', '  bar', '  baz'
+              \ ]
+  call append(0, content)
+
+  normal zM
+
+  call cursor(3, 1)
+  call assert_true(foldclosed(line('.')))
+  normal gj
+  call assert_equal(2, winline())
+
+  call cursor(2, 1)
+  call assert_true(foldclosed(line('.')))
+  normal 2gj
+  call assert_equal(3, winline())
+
+  call cursor(5, 1)
+  call assert_true(foldclosed(line('.')))
+  normal gk
+  call assert_equal(3, winline())
+
+  call cursor(6, 1)
+  call assert_true(foldclosed(line('.')))
+  normal 2gk
+  call assert_equal(2, winline())
+
+  set fdm& sw& wrap& tw&
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab

diff --git a/src/version.c b/src/version.c
index a90c645382fdfb62c88646ab48b0c7537f97b496..faa2777434fe38694558c35b1fb0a308a1294f29 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2385,
 /**/
     2384,
 /**/