patch 8.1.0901: index in getjumplist() may be wrong
Problem: Index in getjumplist() may be wrong. (Epheien)
Solution: Call cleanup_jumplist() earlier. (Yegappan Lakshmanan,
closes #3941)
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 6982ddf..6538b36 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -5271,6 +5271,8 @@
if (wp == NULL)
return;
+ cleanup_jumplist(wp, TRUE);
+
l = list_alloc();
if (l == NULL)
return;
@@ -5279,8 +5281,6 @@
return;
list_append_number(rettv->vval.v_list, (varnumber_T)wp->w_jumplistidx);
- cleanup_jumplist(wp, TRUE);
-
for (i = 0; i < wp->w_jumplistlen; ++i)
{
if (wp->w_jumplist[i].fmark.mark.lnum == 0)
diff --git a/src/testdir/test_jumplist.vim b/src/testdir/test_jumplist.vim
index 02dbd76..be1af5e 100644
--- a/src/testdir/test_jumplist.vim
+++ b/src/testdir/test_jumplist.vim
@@ -28,11 +28,13 @@
normal G
normal gg
- call assert_equal([[
+ let expected = [[
\ {'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0},
\ {'lnum': 50, 'bufnr': bnr, 'col': 0, 'coladd': 0},
- \ {'lnum': 100, 'bufnr': bnr, 'col': 0, 'coladd': 0}], 4],
- \ getjumplist())
+ \ {'lnum': 100, 'bufnr': bnr, 'col': 0, 'coladd': 0}], 3]
+ call assert_equal(expected, getjumplist())
+ " jumplist doesn't change in between calls
+ call assert_equal(expected, getjumplist())
" Traverse the jump list and verify the results
5
@@ -44,12 +46,14 @@
call assert_equal(3, getjumplist()[1])
exe "normal \<C-O>"
normal 20%
- call assert_equal([[
+ let expected = [[
\ {'lnum': 1, 'bufnr': bnr, 'col': 0, 'coladd': 0},
\ {'lnum': 50, 'bufnr': bnr, 'col': 0, 'coladd': 0},
\ {'lnum': 5, 'bufnr': bnr, 'col': 0, 'coladd': 0},
- \ {'lnum': 100, 'bufnr': bnr, 'col': 0, 'coladd': 0}], 5],
- \ getjumplist())
+ \ {'lnum': 100, 'bufnr': bnr, 'col': 0, 'coladd': 0}], 4]
+ call assert_equal(expected, getjumplist())
+ " jumplist doesn't change in between calls
+ call assert_equal(expected, getjumplist())
let l = getjumplist()
call test_garbagecollect_now()
diff --git a/src/version.c b/src/version.c
index b02be7c..998f259 100644
--- a/src/version.c
+++ b/src/version.c
@@ -784,6 +784,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 901,
+/**/
900,
/**/
899,