Skip to content

Fix upstream merge CI failure with 'winaltkeys' #1376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 2, 2023
Merged

Fix upstream merge CI failure with 'winaltkeys' #1376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/testdir/test_macvim.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CheckFeature gui_macvim

" Tests for basic existence of commands and options to make sure no
" regressions have accidentally removed them
func Test_macvim_options_commands()
func Test_macvim_options_commands_exist()
call assert_true(exists('+antialias'), 'Missing option "antialias"')
call assert_true(exists('+blurradius'), 'Missing option "blurradius"')
call assert_true(exists('+fullscreen'), 'Missing option "fullscreen"')
Expand Down Expand Up @@ -62,3 +62,12 @@ func Test_macvim_mappings()
call feedkeys("\<ForceClick>", "xt")
call assert_equal(5, g:marker_value)
endfunc

" Test that setting invalid values with properly throw invalid argument errors
func Test_macvim_invalid_options()
call assert_fails("let &blur=-1", 'E474:')
call assert_fails("let &transparency=-1", 'E474:')
call assert_fails("let &transparency=101", 'E474:')

call assert_fails("let &fuoptions='abcdef'", 'E474:')
endfunc
2 changes: 1 addition & 1 deletion src/testdir/test_options.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1656,7 +1656,7 @@ func Test_string_option_revert_on_failure()
call add(optlist, ['varsofttabstop', '12', 'a123'])
call add(optlist, ['vartabstop', '4,20', '4,'])
endif
if has('gui')
if has('gui') && has('+winaltkeys')
call add(optlist, ['winaltkeys', 'no', 'a123'])
endif
for opt in optlist
Expand Down