# HG changeset patch # User Bram Moolenaar # Date 1562520605 -7200 # Node ID 49ef396af9862d0efd94ad117cc2ae5244cfd6f8 # Parent ebb1ab15dc8587845e950053117b4f69778ead48 patch 8.1.1647: build error with GTK and hangulinput feature commit https://github.com/vim/vim/commit/d84b2c3d88b08722dd4f686256a22c26788ea122 Author: Bram Moolenaar 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) diff --git a/src/hangulin.c b/src/hangulin.c --- 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 --- 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(); diff --git a/src/version.c b/src/version.c --- 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,