summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-02-04 19:01:31 +0100
committerBram Moolenaar <Bram@vim.org>2018-02-04 19:01:31 +0100
commit28944fecff3c40b44325921d45aaf67451b0937f (patch)
tree93dd492972809af3b3db4428ef85fc6f5b34672d
parent2c7b906afb86b986476cfc959732e433b1b4a3b1 (diff)
downloadvim-git-8.0.1471.tar.gz
patch 8.0.1471: on MS-Windows CursorIM highlighting no longer worksv8.0.1471
Problem: On MS-Windows CursorIM highlighting no longer works. Solution: Adjust #if statements. (Ken Takata)
-rw-r--r--src/gui.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gui.c b/src/gui.c
index c9d00a6b7..691153a7a 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -1137,13 +1137,13 @@ gui_update_cursor(
if (id > 0)
{
cattr = syn_id2colors(id, &cfg, &cbg);
-#if defined(FEAT_XIM) || defined(FEAT_HANGULIN)
+#if defined(FEAT_MBYTE) || defined(FEAT_HANGULIN)
{
static int iid;
guicolor_T fg, bg;
if (
-# if defined(FEAT_GUI_GTK) && !defined(FEAT_HANGULIN)
+# if defined(FEAT_GUI_GTK) && defined(FEAT_XIM) && !defined(FEAT_HANGULIN)
preedit_get_status()
# else
im_get_status()
diff --git a/src/version.c b/src/version.c
index 5d417029b..df15d1117 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 */
/**/
+ 1471,
+/**/
1470,
/**/
1469,