patch 8.2.4719: ">" marker sometimes not displayed in the jumplistv8.2.4719

Problem:    ">" marker sometimes not displayed in the jumplist.
Solution:   If the buffer no longer exists show "-invalid-". (Christian
            Brabandt, closes #10131, closes #10100)

4 files changed, 39 insertions, 17 deletions

diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index ec12b6b401..e1a786f291 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -170,7 +170,6 @@ NEW_TESTS = \
 	test_join \
 	test_json \
 	test_jumplist \
-	test_jumps \
 	test_lambda \
 	test_langmap \
 	test_largefile \
diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim
index f54e6f2c50..845c117f65 100644
--- a/src/testdir/test_alot.vim
+++ b/src/testdir/test_alot.vim
@@ -17,7 +17,6 @@ source test_fnamemodify.vim
 source test_ga.vim
 source test_glob2regpat.vim
 source test_global.vim
-source test_jumps.vim
 source test_lispwords.vim
 source test_move.vim
 source test_put.vim
diff --git a/src/testdir/test_jumplist.vim b/src/testdir/test_jumplist.vim
index c838bb9573..054fda083b 100644
--- a/src/testdir/test_jumplist.vim
+++ b/src/testdir/test_jumplist.vim
@@ -61,4 +61,43 @@ func Test_getjumplist()
   call delete("Xtest")
 endfunc
 
+func Test_jumplist_invalid()
+  new
+  clearjumps
+  " put some randome text
+  put ='a'
+  let prev = bufnr('%')
+  setl nomodified bufhidden=wipe
+  e XXJumpListBuffer
+  let bnr = bufnr('%')
+  " 1) empty jumplist
+  let expected = [[
+   \ {'lnum': 2, 'bufnr': prev, 'col': 0, 'coladd': 0}], 1]
+  call assert_equal(expected, getjumplist())
+  let jumps = execute(':jumps')
+  call assert_equal('>', jumps[-1:])
+  " now jump back
+  exe ":norm! \<c-o>"
+  let expected = [[
+    \ {'lnum': 2, 'bufnr': prev, 'col': 0, 'coladd': 0},
+    \ {'lnum': 1, 'bufnr': bnr,  'col': 0, 'coladd': 0}], 0]
+  call assert_equal(expected, getjumplist())
+  let jumps = execute(':jumps')
+  call assert_match('>  0     2    0 -invalid-', jumps)
+endfunc
+
+" Test for '' mark in an empty buffer
+
+func Test_empty_buffer()
+  new
+  insert
+a
+b
+c
+d
+.
+  call assert_equal(1, line("''"))
+  bwipe!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/testdir/test_jumps.vim b/src/testdir/test_jumps.vim
deleted file mode 100644
index 5b46adc47e..0000000000
--- a/src/testdir/test_jumps.vim
+++ /dev/null
@@ -1,15 +0,0 @@
-" Test for '' mark in an empty buffer
-
-func Test_empty_buffer()
-  new
-  insert
-a
-b
-c
-d
-.
-  call assert_equal(1, line("''"))
-  bwipe!
-endfunc
-
-" vim: shiftwidth=2 sts=2 expandtab