Mercurial > vim
changeset 28083:f1c00b8085f6 v8.2.4566
patch 8.2.4566: check for existing buffer in session file may not work
Commit: https://github.com/vim/vim/commit/7d42840033aedf36389208b62e28b4e0b251c199
Author: James Cherti <60946298+jamescherti@users.noreply.github.com>
Date: Mon Mar 14 20:24:51 2022 +0000
patch 8.2.4566: check for existing buffer in session file may not work
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.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 14 Mar 2022 21:30:02 +0100 |
| parents | 49854e230525 |
| children | 031330d43ccd |
| files | src/session.c src/testdir/test_mksession.vim src/version.c |
| diffstat | 3 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- a/src/testdir/test_mksession.vim +++ b/src/testdir/test_mksession.vim @@ -245,6 +245,7 @@ func Test_mksession_one_buffer_two_windo 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_windo 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!