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.

diff --git a/src/option.c b/src/option.c
index 7e1f5d171962b17d85b3c938f7b2cdbba57e74f6..f9d273479353914424b1d43b63bb983a704906ca 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -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

diff --git a/src/testdir/gen_opt_test.vim b/src/testdir/gen_opt_test.vim
index b69ae67241c68ed3f75c6786a5a80877802aedcc..019c757df961c27bcbb807558ed2060cbb13f960 100644 (file)
--- a/src/testdir/gen_opt_test.vim
+++ b/src/testdir/gen_opt_test.vim
@@ -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']],

diff --git a/src/version.c b/src/version.c
index 1a6881f0803b3673b73c86108a9f48760de05510..47dd973b0154031db165de8d136b8fed2b05869f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    585,
 /**/
     584,
 /**/