summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-11-25 21:07:46 +0100
committerBram Moolenaar <Bram@vim.org>2017-11-25 21:07:46 +0100
commitfb1db0e3550355e10ac86c4a4af21209c5456a66 (patch)
tree8e4d3ca0ae832c0bdf759c8944a8c388ad3cab95
parentbe5d998d0ea2226f1f7180c32b19df17ad674853 (diff)
downloadvim-git-fb1db0e3550355e10ac86c4a4af21209c5456a66.tar.gz
patch 8.0.1342: cannot build with Motif and multi-bytev8.0.1342
Problem: Cannot build with Motif and multi-byte. (Mohamed Boughaba) Solution: Use the right input method status flag. (closes #2374)
-rw-r--r--src/mbyte.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/mbyte.c b/src/mbyte.c
index cf60db07f..3ebd183c9 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -5922,7 +5922,7 @@ im_set_active(int active_arg)
if (active != im_get_status())
{
call_imactivatefunc(active);
- im_is_active = active;
+ xim_has_focus = active;
}
return;
}
diff --git a/src/version.c b/src/version.c
index 3fa66e492..5894a69cd 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 */
/**/
+ 1342,
+/**/
1341,
/**/
1340,