diff options
| author | James Cherti <60946298+jamescherti@users.noreply.github.com> | 2022-03-14 20:24:51 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-03-14 20:24:51 +0000 |
| commit | 7d42840033aedf36389208b62e28b4e0b251c199 (patch) | |
| tree | abb1ea5b7e08438e294ad1ef31a734b54b68e94a | |
| parent | 6e2e2cc95b913e33145047e0fade5193da6e4379 (diff) | |
patch 8.2.4566: check for existing buffer in session file may not workv8.2.4566
Problem: Check for existing buffer in session file does not work for files
in the home directory.
Solution: Use fnamemodify(). (James Cherti, closes #9945) Add a test.
| -rw-r--r-- | src/session.c | 4 | ||||
| -rw-r--r-- | src/testdir/test_mksession.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/session.c b/src/session.c index 68e40db80d..fa77f89c8e 100644 --- a/src/session.c +++ b/src/session.c @@ -385,9 +385,9 @@ put_view( // Note, if a buffer for that file already exists, use :badd to // edit that buffer, to not lose folding information (:edit resets // folds in other buffers) - if (fputs("if bufexists(\"", fd) < 0 + if (fputs("if bufexists(fnamemodify(\"", fd) < 0 || ses_fname(fd, wp->w_buffer, flagp, FALSE) == FAIL - || fputs("\") | buffer ", fd) < 0 + || fputs("\", \":p\")) | buffer ", fd) < 0 || ses_fname(fd, wp->w_buffer, flagp, FALSE) == FAIL || fputs(" | else | edit ", fd) < 0 || ses_fname(fd, wp->w_buffer, flagp, FALSE) == FAIL diff --git a/src/testdir/test_mksession.vim b/src/testdir/test_mksession.vim index 494ac873bb..2c2737e006 100644 --- a/src/testdir/test_mksession.vim +++ b/src/testdir/test_mksession.vim @@ -245,6 +245,7 @@ func Test_mksession_one_buffer_two_windows() let count1 = 0 let count2 = 0 let count2buf = 0 + let bufexists = 0 for line in lines if line =~ 'edit \f*Xtest1$' let count1 += 1 @@ -255,10 +256,14 @@ func Test_mksession_one_buffer_two_windows() if line =~ 'buffer \f\{-}Xtest2' let count2buf += 1 endif + if line =~ 'bufexists(fnamemodify(.*, ":p")' + let bufexists += 1 + endif endfor call assert_equal(1, count1, 'Xtest1 count') call assert_equal(2, count2, 'Xtest2 count') call assert_equal(2, count2buf, 'Xtest2 buffer count') + call assert_equal(2, bufexists) close bwipe! diff --git a/src/version.c b/src/version.c index 2ea5965cdc..5576f20f9a 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4566, +/**/ 4565, /**/ 4564, |