Mercurial > vim
changeset 11401:fc1939947789 v8.0.0585
patch 8.0.0585: test_options fails when run in the GUI
commit https://github.com/vim/vim/commit/86e5792906621be5a6c4a1de9b8852e9caf65ea1
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Apr 23 18:44:26 2017 +0200
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.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 23 Apr 2017 18:45:05 +0200 |
parents | 0f8713fe20dc |
children | 3979d8442427 |
files | src/option.c src/testdir/gen_opt_test.vim src/version.c |
diffstat | 3 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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']],