adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.0805: tests: minor issues in gen_opt_test.vim

Browse Source 
Problem:  tests: minor issues in gen_opt_test.vim
Solution: fix restore value for 'undolevels', fix comment, fix
          wrong cpo value, add equality test for global-local options on
          switchback (Milly).

closes: #15913

Signed-off-by: Milly <milly.ca@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Milly
2024-10-22 22:53:01 +02:00
committed by Christian Brabandt
parent a441a3eaab
commit 231480f975
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/testdir/gen_opt_test.vim
View File

@ -1,7 +1,7 @@
" Script to generate src/testdir/opt_test.vim from src/optiondefs.h and " Script to generate src/testdir/opt_test.vim from src/optiondefs.h and
" runtime/doc/options.txt " runtime/doc/options.txt
set cpo=&vim set cpo&vim
" Only do this when build with the +eval feature. " Only do this when build with the +eval feature.
if 1 if 1
@ -25,7 +25,7 @@ endwhile
call extend(global_locals, #{ call extend(global_locals, #{
\ scrolloff: -1, \ scrolloff: -1,
\ sidescrolloff: -1, \ sidescrolloff: -1,
\ undolevels: -12345, \ undolevels: -123456,
\}) \})
" Get local-noglobal options. " Get local-noglobal options.
@ -56,7 +56,8 @@ let skip_setglobal_reasons = #{
\ textwidth: 'TODO: fix missing error handling for setglobal', \ textwidth: 'TODO: fix missing error handling for setglobal',
\} \}
" The terminal size is restored at the end. " Script header.
" The test values contains multibyte characters.
let script = [ let script = [
\ '" DO NOT EDIT: Generated with gen_opt_test.vim', \ '" DO NOT EDIT: Generated with gen_opt_test.vim',
\ '" Used by test_options_all.vim.', \ '" Used by test_options_all.vim.',
@ -417,8 +418,9 @@ while 1
endfor endfor
" Testing to clear the local value and switch back to the global value. " Testing to clear the local value and switch back to the global value.
if global_locals->has_key(fullname) if global_locals->has_key(fullname)
let swichback_val = global_locals[fullname] let switchback_val = global_locals[fullname]
call add(script, $'setlocal {opt}={swichback_val}') call add(script, $'setlocal {opt}={switchback_val}')
call add(script, $'call assert_equal(&g:{fullname}, &{fullname})')
endif endif
endfor endfor

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
805,
/**/ /**/
804, 804,
/**/ /**/