# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1593609304 -7200
# Node ID 2d3cd9acf8533f44f444a6ecabeffc99ab375dee
# Parent  61b58608459911b4430bf0dc8fd3f227c09345f4
patch 8.2.1107: 'imactivatefunc' and 'imstatusfunc' are not used in the GUI

Commit: https://github.com/vim/vim/commit/ef8c617b9c4dc262ed34598d7e382237696c3d61
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Jul 1 15:12:44 2020 +0200

    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 https://github.com/vim/vim/issues/6367)

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4133,7 +4133,7 @@ A jump table for the options with a shor
 			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 shor
 			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
--- 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
--- 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
--- 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,