Permalink
Browse files

patch 8.0.0585: test_options fails when run in the GUI

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.
  • Loading branch information...
brammool committed Apr 23, 2017
1 parent 9423749 commit 86e5792906621be5a6c4a1de9b8852e9caf65ea1
Showing with 4 additions and 1 deletion.
  1. +1 −1 src/option.c
  2. +1 −0 src/testdir/gen_opt_test.vim
  3. +2 −0 src/version.c
View
@@ -6403,7 +6403,7 @@ did_set_string_option(
#if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
else if (varp == &p_imak)
{
if (gui.in_use && !im_xim_isvalid_imactivate())
if (!im_xim_isvalid_imactivate())
errmsg = e_invarg;
}
#endif
@@ -96,6 +96,7 @@ let test_values = {
\ 'guifontwide': [['', 'fixedsys'], []],
\ 'helplang': [['', 'de', 'de,it'], ['xxx']],
\ 'highlight': [['', 'e:Error'], ['xxx']],
\ 'imactivatekey': [['', 'S-space'], ['xxx']],
\ 'isfname': [['', '@', '@,48-52'], ['xxx', '@48']],
\ 'isident': [['', '@', '@,48-52'], ['xxx', '@48']],
\ 'iskeyword': [['', '@', '@,48-52'], ['xxx', '@48']],
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
585,
/**/
584,
/**/

0 comments on commit 86e5792

Please sign in to comment.