aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-03-13 08:31:31 -0500
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-03-13 09:06:57 -0500
commit60670c1fd35db29a9a7a20e7ce743b8c17842172 (patch)
tree1ebbcee26c59208389432ba2716b51ac0f30b1bc /src
parent5d5e018a5c1a8f0f185718dd4513b908c164a6b9 (diff)
downloadrneovim-60670c1fd35db29a9a7a20e7ce743b8c17842172.tar.gz
rneovim-60670c1fd35db29a9a7a20e7ce743b8c17842172.tar.bz2
rneovim-60670c1fd35db29a9a7a20e7ce743b8c17842172.zip
vim-patch:8.2.2594: alternate buffer added to session file even when it's hidden
Problem: Alternate buffer added to session file even when it's hidden. Solution: Check the 'buflisted' option. (closes vim/vim#7951) https://github.com/vim/vim/commit/0756f757edba755b75e0c9c612ab2f7e673def84 N/A patches for version.c: vim-patch:8.2.2593: list of distributed files is incomplete Problem: List of distributed files is incomplete. Solution: Add a file and rename another. https://github.com/vim/vim/commit/0de8e2d6a3fae61c4d9dfdd6f16fc5040d994f6c
Diffstat (limited to 'src')
-rw-r--r--src/nvim/ex_session.c3
-rw-r--r--src/nvim/testdir/test_mksession.vim14
2 files changed, 16 insertions, 1 deletions
diff --git a/src/nvim/ex_session.c b/src/nvim/ex_session.c
index 63789b3981..09453e100d 100644
--- a/src/nvim/ex_session.c
+++ b/src/nvim/ex_session.c
@@ -387,9 +387,10 @@ static int put_view(
if (wp->w_alt_fnum) {
buf_T *const alt = buflist_findnr(wp->w_alt_fnum);
- // Set the alternate file.
+ // Set the alternate file if the buffer is listed.
if ((flagp == &ssop_flags) && alt != NULL && alt->b_fname != NULL
&& *alt->b_fname != NUL
+ && alt->b_p_bl
&& (fputs("balt ", fd) < 0
|| ses_fname(fd, alt, flagp, true) == FAIL)) {
return FAIL;
diff --git a/src/nvim/testdir/test_mksession.vim b/src/nvim/testdir/test_mksession.vim
index 7c7804212b..8486f3ff68 100644
--- a/src/nvim/testdir/test_mksession.vim
+++ b/src/nvim/testdir/test_mksession.vim
@@ -331,6 +331,20 @@ func Test_mkview_no_balt()
%bwipe
endfunc
+func Test_mksession_no_balt()
+ edit Xtestfile1
+ edit Xtestfile2
+
+ bdelete Xtestfile1
+ mksession! Xtestview
+
+ source Xtestview
+ call assert_equal(0, buflisted('Xtestfile1'))
+
+ call delete('Xtestview')
+ %bwipe
+endfunc
+
" Test :mkview with a file argument.
func Test_mkview_file()
" Create a view with line number and a fold.