changeset 17296:49ef396af986 v8.1.1647

patch 8.1.1647: build error with GTK and hangulinput feature commit https://github.com/vim/vim/commit/d84b2c3d88b08722dd4f686256a22c26788ea122 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jul 7 19:16:58 2019 +0200 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)
author Bram Moolenaar <Bram@vim.org>
date Sun, 07 Jul 2019 19:30:05 +0200
parents ebb1ab15dc85
children d1e06cc5ced2
files src/hangulin.c src/mbyte.c src/version.c
diffstat 3 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -5848,6 +5848,11 @@ xim_queue_key_press_event(GdkEventKey *e
     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();
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1647,
+/**/
     1646,
 /**/
     1645,