mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-04 17:06:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Problem:    Session sets the local 'scrolloff' value to the global value.
Solution:   Do not let restoring the global option value change the local
            value.
388908352f
This commit is contained in:
Jan Edmund Lazo
2020-11-01 12:17:45 -05:00
parent ff11247837
commit 4b398413e4
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/ex_session.c
View File

@@ -897,8 +897,8 @@ void ex_mkrc(exarg_T *eap)
if (!failed && view_session) { if (!failed && view_session) {
if (put_line(fd, if (put_line(fd,
"let s:so_save = &so | let s:siso_save = &siso" "let s:so_save = &g:so | let s:siso_save = &g:siso"
" | set so=0 siso=0") == FAIL) { " | setg so=0 siso=0 | setl so=-1 siso=-1") == FAIL) {
failed = true; failed = true;
} }
if (eap->cmdidx == CMD_mksession) { if (eap->cmdidx == CMD_mksession) {
@@ -949,7 +949,7 @@ void ex_mkrc(exarg_T *eap)
} }
if (fprintf(fd, if (fprintf(fd,
"%s", "%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") "doautoall SessionLoadPost\n")
< 0) { < 0) {
failed = true; failed = true;

13
src/nvim/testdir/test_mksession.vim
View File

@@ -470,4 +470,17 @@ func Test_mkvimrc()
call delete('Xtestvimrc') call delete('Xtestvimrc')
endfunc 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 " vim: shiftwidth=2 sts=2 expandtab