neovim

commit bef7552f7088ff411bd68fc236cfd7b269ad157e
parent 61126fcc693c1f5aca882cfc83794f8c344df8cd
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Tue, 15 Mar 2022 10:20:00 +0800

Merge pull request #17725 from zeertzjq/vim-8.2.4566

vim-patch:8.2.4566: check for existing buffer in session file may not work
Diffstat:
M
src/nvim/ex_session.c
 | 
2
+-
M
src/nvim/testdir/test_mksession.vim
 | 
5
+++++

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/nvim/ex_session.c b/src/nvim/ex_session.c
@@ -365,7 +365,7 @@ static int put_view(FILE *fd, win_T *wp, int add_edit, unsigned *flagp, int curr
       // edit that buffer, to not lose folding information (:edit resets
       // folds in other buffers)
       if (fprintf(fd,
-                  "if bufexists(\"%s\") | buffer %s | else | edit %s | endif\n"
+                  "if bufexists(fnamemodify(\"%s\", \":p\")) | buffer %s | else | edit %s | endif\n"
                   // Fixup :terminal buffer name. #7836
                   "if &buftype ==# 'terminal'\n"
                   "  silent file %s\n"
diff --git a/src/nvim/testdir/test_mksession.vim b/src/nvim/testdir/test_mksession.vim
@@ -219,6 +219,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
@@ -229,10 +230,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!