diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-11-25 17:48:33 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-11-25 17:48:33 +0100 |
| commit | 281c93e7140ba87552c4edcbfdaaa5e25dc6a97a (patch) | |
| tree | fa439d092acb229495435915644c38679328e375 /src | |
| parent | 83799a7b7414048df4ff4e507293416e8438e225 (diff) | |
patch 8.0.1340: MS-Windows: cannot build GUI without IMEv8.0.1340
Problem: MS-Windows: cannot build GUI without IME.
Solution: Define im_get_status() and im_set_active() when IME is not used.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbyte.c | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/mbyte.c b/src/mbyte.c index b39dddddcd..cf60db07f5 100644 --- 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 */ diff --git a/src/version.c b/src/version.c index 32c83c8e1d..e391e52974 100644 --- 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, |