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

Merge pull request #13203 from janlazo/vim-8.2.1936

Browse Source 
vim-patch:8.2.1936
This commit is contained in:
Jan Edmund Lazo
2020-11-01 16:39:30 -05:00
committed by GitHub
parent d1091bc658 442ad4bb63
commit 90f3a8ba29
3 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/vim-patch.sh
View File

@@ -211,6 +211,18 @@ preprocess_patch() {
# Remove vimrc_example.vim
local na_vimrcexample='vimrc_example\.vim'
2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/runtime/\<\%('${na_vimrcexample}'\)\>@norm! d/\v(^diff)|%$
' +w +q "$file"
# Rename src/ paths to src/nvim/
LC_ALL=C sed -e 's/\( [ab]\/src\)/\1\/nvim/g' \
"$file" > "$file".tmp && mv "$file".tmp "$file"
# Rename evalfunc.c to eval/funcs.c
LC_ALL=C sed -e 's/\( [ab]\/src\/nvim\)\/evalfunc\.c/\1\/eval\/funcs\.c/g' \
"$file" > "$file".tmp && mv "$file".tmp "$file"
# Rename userfunc.c to eval/userfunc.c
LC_ALL=C sed -e 's/\( [ab]\/src\/nvim\)\/userfunc\.c/\1\/eval\/userfunc\.c/g' \
"$file" > "$file".tmp && mv "$file".tmp "$file"
# Rename session.c to ex_session.c

6
src/nvim/ex_session.c
View File

@@ -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;

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

@@ -470,4 +470,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