diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-07-01 15:12:44 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-07-01 15:12:44 +0200 |
| commit | ef8c617b9c4dc262ed34598d7e382237696c3d61 (patch) | |
| tree | 58686e56c1291e18d796c8133debfcd93121f352 | |
| parent | 8e6cbb72324b6fb25d1a9abd6cc4d102d0e5f14e (diff) | |
patch 8.2.1107: 'imactivatefunc' and 'imstatusfunc' are not used in the GUIv8.2.1107
Problem: 'imactivatefunc' and 'imstatusfunc' are not used in the GUI.
Solution: Adjust the #ifdefs. (closes #6367)
| -rw-r--r-- | runtime/doc/options.txt | 4 | ||||
| -rw-r--r-- | src/gui_xim.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_iminsert.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 4e78a2fa68..bd6cc62d62 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -4133,7 +4133,7 @@ A jump table for the options with a short description can be found at |Q_op|. global This option specifies a function that will be called to activate or deactivate the Input Method. - It is not used in the GUI. + It is not used in the MS-Windows GUI version. The expression will be evaluated in the |sandbox| when set from a modeline, see |sandbox-option|. @@ -4242,7 +4242,7 @@ A jump table for the options with a short description can be found at |Q_op|. global This option specifies a function that is called to obtain the status of Input Method. It must return a positive number when IME is active. - It is not used in the GUI. + It is not used in the MS-Windows GUI version. Example: > function ImStatusFunc() diff --git a/src/gui_xim.c b/src/gui_xim.c index b5875ee2cd..ee92301337 100644 --- a/src/gui_xim.c +++ b/src/gui_xim.c @@ -57,7 +57,7 @@ xim_log(char *s, ...) } #endif -#ifdef FEAT_GUI +#if defined(FEAT_GUI_MSWIN) # define USE_IMACTIVATEFUNC (!gui.in_use && *p_imaf != NUL) # define USE_IMSTATUSFUNC (!gui.in_use && *p_imsf != NUL) #else diff --git a/src/testdir/test_iminsert.vim b/src/testdir/test_iminsert.vim index 04c8a15995..1f19412789 100644 --- a/src/testdir/test_iminsert.vim +++ b/src/testdir/test_iminsert.vim @@ -27,7 +27,7 @@ func Test_iminsert2() set imactivatefunc= set imstatusfunc= - let expected = has('gui_running') ? 0 : 1 + let expected = has('gui_win32') ? 0 : 1 call assert_equal(expected, s:imactivatefunc_called) call assert_equal(expected, s:imstatusfunc_called) endfunc @@ -38,10 +38,7 @@ func Test_getimstatus() elseif !has('gui_mac') CheckFeature xim endif - if has('gui_running') - if !has('win32') - throw 'Skipped: running in the GUI, only works on MS-Windows' - endif + if has('gui_win32') set imactivatefunc= set imstatusfunc= else diff --git a/src/version.c b/src/version.c index 8f08cc5cf9..97c3c4ca62 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1107, +/**/ 1106, /**/ 1105, |