patch 8.2.1107: 'imactivatefunc' and 'imstatusfunc' are not used in the GUI
Problem: 'imactivatefunc' and 'imstatusfunc' are not used in the GUI.
Solution: Adjust the #ifdefs. (closes #6367)
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 4e78a2f..bd6cc62 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4133,7 +4133,7 @@
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 @@
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 b5875ee..ee92301 100644
--- a/src/gui_xim.c
+++ b/src/gui_xim.c
@@ -57,7 +57,7 @@
}
#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 04c8a15..1f19412 100644
--- a/src/testdir/test_iminsert.vim
+++ b/src/testdir/test_iminsert.vim
@@ -27,7 +27,7 @@
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 @@
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 8f08cc5..97c3c4c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1107,
+/**/
1106,
/**/
1105,