From 59d550345d2531b1b1058a82ae4e4de6a941f8ad Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
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')

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