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)

diff --git a/src/hangulin.c b/src/hangulin.c
index e08fe6317a8d10cc4482c56feb3b9e547bb7c0c3..337ea84f4c3836c279e06b2c20fd122a545fdb35 100644 (file)
--- 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 9c03f08d8255866bed8516d495a336943fb3bc07..94adddf7ef9b27632f643c35bfe0f89ca4e860c1 100644 (file)
--- 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 52bce3b683a80997770783782e38529e933d3d87..5cf7da3356a009c7d0b0171acd0b58f977d3d1d4 100644 (file)
--- 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,
 /**/