Mercurial > vim

changeset 12928:75ffa8ee989c v8.0.1340

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1340: MS-Windows: cannot build GUI without IME commit https://github.com/vim/vim/commit/281c93e7140ba87552c4edcbfdaaa5e25dc6a97a Author: Bram Moolenaar <Bram@vim.org> Date: Sat Nov 25 17:48:33 2017 +0100 patch 8.0.1340: MS-Windows: cannot build GUI without IME Problem: MS-Windows: cannot build GUI without IME. Solution: Define im_get_status() and im_set_active() when IME is not used.
author Christian Brabandt <cb@256bit.org>
date Sat, 25 Nov 2017 18:00:04 +0100
parents 43d31368dd38
children 9ee34e120f06
files src/mbyte.c src/version.c
diffstat 2 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -6473,7 +6473,7 @@ xim_get_status_area_height(void)
 
 #else /* !defined(FEAT_XIM) */
 
-# ifndef FEAT_GUI_W32
+# if !defined(FEAT_GUI_W32) || !(defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))
 static int im_was_set_active = FALSE;
 
     int
@@ -6499,6 +6499,13 @@ im_set_active(int active_arg)
     }
 #  endif
 }
+
+#  ifdef FEAT_GUI
+    void
+im_set_position(int row, int col)
+{
+}
+#  endif
 # endif
 
 #endif /* FEAT_XIM */
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1340,
+/**/
     1339,
 /**/
     1338,