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

patch 8.0.0585: test_options fails when run in the GUI

Browse Source 
Problem:    Test_options fails when run in the GUI.
Solution:   Also check the 'imactivatekey' value when the GUI is not running.
            Specify test values that work and that fail.
This commit is contained in:
Bram Moolenaar
2017-04-23 18:44:26 +02:00
parent 94237495c0
commit 86e5792906
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/option.c
View File

@ -6403,7 +6403,7 @@ did_set_string_option(
#if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
else if (varp == &p_imak) else if (varp == &p_imak)
{ {
if (gui.in_use && !im_xim_isvalid_imactivate()) if (!im_xim_isvalid_imactivate())
errmsg = e_invarg; errmsg = e_invarg;
} }
#endif #endif

1
src/testdir/gen_opt_test.vim
View File

@ -96,6 +96,7 @@ let test_values = {
\ 'guifontwide': [['', 'fixedsys'], []], \ 'guifontwide': [['', 'fixedsys'], []],
\ 'helplang': [['', 'de', 'de,it'], ['xxx']], \ 'helplang': [['', 'de', 'de,it'], ['xxx']],
\ 'highlight': [['', 'e:Error'], ['xxx']], \ 'highlight': [['', 'e:Error'], ['xxx']],
\ 'imactivatekey': [['', 'S-space'], ['xxx']],
\ 'isfname': [['', '@', '@,48-52'], ['xxx', '@48']], \ 'isfname': [['', '@', '@,48-52'], ['xxx', '@48']],
\ 'isident': [['', '@', '@,48-52'], ['xxx', '@48']], \ 'isident': [['', '@', '@,48-52'], ['xxx', '@48']],
\ 'iskeyword': [['', '@', '@,48-52'], ['xxx', '@48']], \ 'iskeyword': [['', '@', '@,48-52'], ['xxx', '@48']],

2
src/version.c
View File

@ -764,6 +764,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 */
/**/
585,
/**/ /**/
584, 584,
/**/ /**/