Mercurial > vim
changeset 28388:320991d9812e v8.2.4719
patch 8.2.4719: ">" marker sometimes not displayed in the jumplist
Commit: https://github.com/vim/vim/commit/a0f659c76e22108880f857b8961422afc5ed8f5d
Author: Christian Brabandt <cb@256bit.org>
Date: Sat Apr 9 13:35:00 2022 +0100
patch 8.2.4719: ">" marker sometimes not displayed in the jumplist
Problem: ">" marker sometimes not displayed in the jumplist.
Solution: If the buffer no longer exists show "-invalid-". (Christian
Brabandt, closes #10131, closes #10100)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 09 Apr 2022 14:45:05 +0200 |
| parents | eb8ad882fa29 |
| children | 24fc9545bf2a |
| files | runtime/doc/motion.txt src/mark.c src/testdir/Make_all.mak src/testdir/test_alot.vim src/testdir/test_jumplist.vim src/testdir/test_jumps.vim src/version.c |
| diffstat | 7 files changed, 48 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -1077,6 +1077,9 @@ The "file/text" column shows the file na in the current file (an indent is removed and a long line is truncated to fit in the window). +The marker ">" indicates the current position in the jumplist. It may not be +shown when filtering the |:jump| command using |:filter| + You are currently in line 1167. If you then use the CTRL-O command, the cursor is put in line 1154. This results in:
--- a/src/mark.c +++ b/src/mark.c @@ -871,6 +871,10 @@ ex_jumps(exarg_T *eap UNUSED) { name = fm_getname(&curwin->w_jumplist[i].fmark, 16); + // Make sure to output the current indicator, even when on an wiped + // out buffer. ":filter" may still skip it. + if (name == NULL && i == curwin->w_jumplistidx) + name = vim_strsave((char_u *)"-invalid-"); // apply :filter /pat/ or file name not available if (name == NULL || message_filtered(name)) {
--- 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 \
--- 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
--- 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