diff options
| -rw-r--r-- | runtime/doc/options.txt | 2 | ||||
| -rw-r--r-- | src/option.c | 3 | ||||
| -rw-r--r-- | src/testdir/test_mksession.vim | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 15 insertions, 8 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 80bb235ae..1f4c7e703 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -6511,7 +6511,7 @@ A jump table for the options with a short description can be found at |Q_op|. global values for local options) options all options and mappings (also global values for local options) - skiprtp exclude 'runtimepath' from the options + skiprtp exclude 'runtimepath' and 'packpath' from the options resize size of the Vim window: 'lines' and 'columns' sesdir the directory in which the session file is located will become the current directory (useful with diff --git a/src/option.c b/src/option.c index d7997b064..3c248c193 100644 --- a/src/option.c +++ b/src/option.c @@ -4615,7 +4615,8 @@ makeset(FILE *fd, int opt_flags, int local_only) if ((opt_flags & OPT_GLOBAL) && optval_default(p, varp, p_cp)) continue; - if ((opt_flags & OPT_SKIPRTP) && p->var == (char_u *)&p_rtp) + if ((opt_flags & OPT_SKIPRTP) && (p->var == (char_u *)&p_rtp + || p->var == (char_u *)&p_pp)) continue; round = 2; diff --git a/src/testdir/test_mksession.vim b/src/testdir/test_mksession.vim index 25c508102..045aa2de0 100644 --- a/src/testdir/test_mksession.vim +++ b/src/testdir/test_mksession.vim @@ -133,21 +133,25 @@ endfunc def Test_mksession_skiprtp() mksession! Xtest_mks.out - var found = 0 + var found_rtp = 0 + var found_pp = 0 for line in readfile('Xtest_mks.out') if line =~ 'set runtimepath' - found = 1 - break + found_rtp += 1 + endif + if line =~ 'set packpath' + found_pp += 1 endif endfor - assert_equal(1, found) + assert_equal(1, found_rtp) + assert_equal(1, found_pp) delete('Xtest_mks.out') set sessionoptions+=skiprtp mksession! Xtest_mks.out - found = 0 + var found = 0 for line in readfile('Xtest_mks.out') - if line =~ 'set runtimepath' + if line =~ 'set \(runtimepath\|packpath\)' found = 1 break endif diff --git a/src/version.c b/src/version.c index 17afa34a6..83d7e5725 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 */ /**/ + 2778, +/**/ 2777, /**/ 2776, |