Mercurial > vim
changeset 22776:0583f3e2c12e v8.2.1936
patch 8.2.1936: session sets the local 'scrolloff' value to the global value
Commit: https://github.com/vim/vim/commit/388908352f88e7391accb3545b082db0fc89d9f7
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Nov 1 17:40:54 2020 +0100
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.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 01 Nov 2020 17:45:04 +0100 |
| parents | a3e03821096a |
| children | a707e11443ee |
| files | src/session.c src/testdir/test_mksession.vim src/version.c |
| diffstat | 3 files changed, 17 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/session.c +++ b/src/session.c @@ -1216,7 +1216,7 @@ ex_mkrc(exarg_T *eap) #ifdef FEAT_SESSION if (!failed && view_session) { - if (put_line(fd, "let s:so_save = &so | let s:siso_save = &siso | set so=0 siso=0") == FAIL) + if (put_line(fd, "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) { @@ -1261,7 +1261,7 @@ ex_mkrc(exarg_T *eap) failed |= (put_view(fd, curwin, !using_vdir, flagp, -1, NULL) == FAIL); } - if (put_line(fd, "let &so = s:so_save | let &siso = s:siso_save") + if (put_line(fd, "let &g:so = s:so_save | let &g:siso = s:siso_save") == FAIL) failed = TRUE; #ifdef FEAT_SEARCH_EXTRA
--- a/src/testdir/test_mksession.vim +++ b/src/testdir/test_mksession.vim @@ -859,4 +859,17 @@ func Test_mkvimrc() call delete('Xtestvimrc') endfunc +func Test_scrolloff() + set sessionoptions+=localoptions + setlocal so=1 siso=1 + mksession! Xtest_mks.out + setlocal so=-1 siso=-1 + source Xtest_mks.out + call assert_equal(1, &l:so) + call assert_equal(1, &l:siso) + call delete('Xtest_mks.out') + setlocal so& siso& + set sessionoptions& +endfunc + " vim: shiftwidth=2 sts=2 expandtab