From d84b2c3d88b08722dd4f686256a22c26788ea122 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 7 Jul 2019 19:16:58 +0200
Subject: patch 8.1.1647: build error with GTK and hangulinput feature

Problem:    Build error with GTK and hangulinput feature, im_get_status()
            defined twice. (Dominique Pelle)
Solution:   Adjust im_get_status(). (closes #4628)
---
 src/hangulin.c | 2 ++
 src/mbyte.c    | 5 +++++
 src/version.c  | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/src/hangulin.c b/src/hangulin.c
index e08fe6317..337ea84f4 100644
--- a/src/hangulin.c
+++ b/src/hangulin.c
@@ -404,11 +404,13 @@ hangul_input_state_set(int state)
     hangul_input_clear();
 }
 
+#if (!defined(FEAT_XIM) && !defined(FEAT_GUI_GTK)) || defined(PROTO)
     int
 im_get_status(void)
 {
     return hangul_input_state_get();
 }
+#endif
 
     void
 hangul_input_state_toggle(void)
diff --git a/src/mbyte.c b/src/mbyte.c
index 9c03f08d8..94adddf7e 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -5848,6 +5848,11 @@ xim_queue_key_press_event(GdkEventKey *event, int down)
     int
 im_get_status(void)
 {
+#  ifdef FEAT_HANGULIN
+    if (hangul_input_state_get())
+	return TRUE;
+#  endif
+
 #  ifdef FEAT_EVAL
     if (USE_IMSTATUSFUNC)
 	return call_imstatusfunc();
diff --git a/src/version.c b/src/version.c
index 52bce3b68..5cf7da335 100644
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1647,
 /**/
     1646,
 /**/
-- 
cgit v1.2.1