summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-12-17 21:54:55 +0100
committerBram Moolenaar <Bram@vim.org>2017-12-17 21:54:55 +0100
commitcb89c98c264b0fe9fd26e3501eab5a062e57c064 (patch)
tree0578390eefcf78e353b45f60487de11471365aa2
parentf0b03c4e98f8a7184d8b4a5d702cbcd602426923 (diff)
patch 8.0.1401: cannot build with GTK but without XIMv8.0.1401
Problem: Cannot build with GTK but without XIM. (Guido) Solution: Adjust #ifdef. (closes #2461)
-rw-r--r--src/gui.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui.c b/src/gui.c
index 4f03ed8096..5aa8214f5f 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -1136,7 +1136,7 @@ gui_update_cursor(
if (id > 0)
{
cattr = syn_id2colors(id, &cfg, &cbg);
-#if defined(FEAT_MBYTE) || defined(FEAT_HANGULIN)
+#if defined(FEAT_XIM) || defined(FEAT_HANGULIN)
{
static int iid;
guicolor_T fg, bg;
diff --git a/src/version.c b/src/version.c
index 2da64a2738..ba65a54fac 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 */
/**/
+ 1401,
+/**/
1400,
/**/
1399,