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 7e1f5d1..f9d2734 100644
--- a/src/option.c
+++ b/src/option.c
@@ -6403,7 +6403,7 @@
#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 b69ae67..019c757 100644
--- a/src/testdir/gen_opt_test.vim
+++ b/src/testdir/gen_opt_test.vim
@@ -96,6 +96,7 @@
\ '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 1a6881f..47dd973 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 585,
+/**/
584,
/**/
583,