Skip to content

Commit 86e5792

Browse files
committed
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.
1 parent 9423749 commit 86e5792

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

src/option.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6403,7 +6403,7 @@ did_set_string_option(
64036403
#if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
64046404
else if (varp == &p_imak)
64056405
{
6406-
if (gui.in_use && !im_xim_isvalid_imactivate())
6406+
if (!im_xim_isvalid_imactivate())
64076407
errmsg = e_invarg;
64086408
}
64096409
#endif

src/testdir/gen_opt_test.vim

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ let test_values = {
9696
\ 'guifontwide': [['', 'fixedsys'], []],
9797
\ 'helplang': [['', 'de', 'de,it'], ['xxx']],
9898
\ 'highlight': [['', 'e:Error'], ['xxx']],
99+
\ 'imactivatekey': [['', 'S-space'], ['xxx']],
99100
\ 'isfname': [['', '@', '@,48-52'], ['xxx', '@48']],
100101
\ 'isident': [['', '@', '@,48-52'], ['xxx', '@48']],
101102
\ 'iskeyword': [['', '@', '@,48-52'], ['xxx', '@48']],

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
585,
767769
/**/
768770
584,
769771
/**/

0 commit comments

Comments
 (0)