diff options
| author | Michael Schupikov <DarkDeepBlue@users.noreply.github.com> | 2017-09-23 08:32:29 +0200 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-09-23 08:32:29 +0200 |
| commit | f8dcd319d9338cccc66ae481d5865e8816794306 (patch) | |
| tree | 88a5e662e43d3d8132032ded70abdb6f7788f8c7 /src | |
| parent | 2e9a345b3ea57f207352e8a83939f48a0ea1caf2 (diff) | |
| download | rneovim-f8dcd319d9338cccc66ae481d5865e8816794306.tar.gz rneovim-f8dcd319d9338cccc66ae481d5865e8816794306.tar.bz2 rneovim-f8dcd319d9338cccc66ae481d5865e8816794306.zip | |
vim-patch:8.0.0294 (#7305)
Problem: Argument list is not stored correctly in a session file.
(lgpasquale)
Solution: Use "$argadd" instead of "argadd". (closes vim/vim#1434)
https://github.com/vim/vim/commit/79da563cf9220b9abb83455a68d995684133ea56
Signed-off-by: Michael Schupikov <michael@schupikov.de>
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_docmd.c | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/Makefile | 1 | ||||
| -rw-r--r-- | src/nvim/testdir/test_mksession.vim | 15 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
4 files changed, 18 insertions, 2 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index f9442a4cf6..47e23b6e80 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -9378,7 +9378,7 @@ ses_arglist ( (void)vim_FullName((char *)s, (char *)buf, MAXPATHL, FALSE); s = buf; } - if (fputs("argadd ", fd) < 0 || ses_put_fname(fd, s, flagp) == FAIL + if (fputs("$argadd ", fd) < 0 || ses_put_fname(fd, s, flagp) == FAIL || put_eol(fd) == FAIL) { xfree(buf); return FAIL; diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 96de7224c5..9133bfc0a2 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -58,6 +58,7 @@ NEW_TESTS ?= \ test_match.res \ test_matchadd_conceal.res \ test_matchadd_conceal_utf8.res \ + test_mksession.res \ test_nested_function.res \ test_normal.res \ test_quickfix.res \ diff --git a/src/nvim/testdir/test_mksession.vim b/src/nvim/testdir/test_mksession.vim new file mode 100644 index 0000000000..2238213850 --- /dev/null +++ b/src/nvim/testdir/test_mksession.vim @@ -0,0 +1,15 @@ +" Tests for sessions + +" Verify that arglist is stored correctly to the session file. +func Test_mksession_arglist() + argdel * + next file1 file2 file3 file4 + mksession! Xtest_mks.out + source Xtest_mks.out + call assert_equal(['file1', 'file2', 'file3', 'file4'], argv()) + + call delete('Xtest_mks.out') + argdel * +endfunc + +" vim: shiftwidth=2 sts=2 expandtab diff --git a/src/nvim/version.c b/src/nvim/version.c index 675ebb17b0..d4f9c0232f 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -658,7 +658,7 @@ static const int included_patches[] = { 297, // 296, // 295, - // 294, + 294, // 293, // 292, 291, |