diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-04-23 18:44:26 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-04-23 18:44:26 +0200 |
| commit | 86e5792906621be5a6c4a1de9b8852e9caf65ea1 (patch) | |
| tree | 8e92db84b5f97dfac89badb08d82137d53110493 | |
| parent | 94237495c03f919a60b262fdcd3861e1931fc45a (diff) | |
| download | vim-git-8.0.0585.tar.gz | |
patch 8.0.0585: test_options fails when run in the GUIv8.0.0585
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.
| -rw-r--r-- | src/option.c | 2 | ||||
| -rw-r--r-- | src/testdir/gen_opt_test.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/option.c b/src/option.c index 7e1f5d171..f9d273479 100644 --- 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 b69ae6724..019c757df 100644 --- 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 1a6881f08..47dd973b0 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 585, +/**/ 584, /**/ 583, |