vim-patch:8.2.1936: session sets the local 'scrolloff' value to the global value

Problem:    Session sets the local 'scrolloff' value to the global value.
Solution:   Do not let restoring the global option value change the local
            value.
https://github.com/vim/vim/commit/388908352f88e7391accb3545b082db0fc89d9f7

1 files changed, 3 insertions, 3 deletions

diff --git a/src/nvim/ex_session.c b/src/nvim/ex_session.c
index 6b00b986dc..42a9ef08f9 100644
--- a/src/nvim/ex_session.c
+++ b/src/nvim/ex_session.c
@@ -897,8 +897,8 @@ void ex_mkrc(exarg_T *eap)
 
     if (!failed && view_session) {
       if (put_line(fd,
-                   "let s:so_save = &so | let s:siso_save = &siso"
-                   " | set so=0 siso=0") == FAIL) {
+                   "let s:so_save = &g:so | let s:siso_save = &g:siso"
+                   " | setg so=0 siso=0 | setl so=-1 siso=-1") == FAIL) {
         failed = true;
       }
       if (eap->cmdidx == CMD_mksession) {
@@ -949,7 +949,7 @@ void ex_mkrc(exarg_T *eap)
       }
       if (fprintf(fd,
                   "%s",
-                  "let &so = s:so_save | let &siso = s:siso_save\n"
+                  "let &g:so = s:so_save | let &g:siso = s:siso_save\n"
                   "doautoall SessionLoadPost\n")
           < 0) {
         failed = true;