From 8415615b593c6673083a5004d5db9e8af4914726 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sat, 22 May 2021 15:01:08 -0400 Subject: vim-patch:8.2.2772: problems when restoring 'runtimepath' from a session file Problem: Problems when restoring 'runtimepath' from a session file. Solution: Add the "skiprtp" item in 'sessionoptions'. https://github.com/vim/vim/commit/635bd60804966803490287e97460ecdc91d5fe0a Allow "terminal" value for sessionoptions even if it's no-opt because patch v8.0.1592 is not ported yet. Omit vim9 test, Test_mksession_skiprtp(). --- src/nvim/option.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/nvim/option.c') diff --git a/src/nvim/option.c b/src/nvim/option.c index ad481af7fa..b33571ccc2 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -5232,6 +5232,10 @@ int makeset(FILE *fd, int opt_flags, int local_only) continue; } + if ((opt_flags & OPT_SKIPRTP) && p->var == (char_u *)&p_rtp) { + continue; + } + round = 2; if (p->indir != PV_NONE) { if (p->var == VAR_WIN) { -- cgit From 59d550345d2531b1b1058a82ae4e4de6a941f8ad Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sat, 22 May 2021 15:41:34 -0400 Subject: vim-patch:8.2.2778: problem restoring 'packpath' in session Problem: Problem restoring 'packpath' in session. Solution: Let "skiprtp" also apply to 'packpath'. https://github.com/vim/vim/commit/d23b714d8b9ed8e16ef553098acc6da0979e94fc Port Test_mksession_skiprtp() to lua functional test. --- src/nvim/option.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/nvim/option.c') diff --git a/src/nvim/option.c b/src/nvim/option.c index b33571ccc2..1454af1a73 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -5232,7 +5232,8 @@ int makeset(FILE *fd, int opt_flags, int local_only) 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; } -- cgit