0
0
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00

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)
This commit is contained in:
Bram Moolenaar
2019-07-07 19:16:58 +02:00
parent 56a6312099
commit d84b2c3d88
3 changed files with 9 additions and 0 deletions

View File

@@ -404,11 +404,13 @@ hangul_input_state_set(int state)
hangul_input_clear(); hangul_input_clear();
} }
#if (!defined(FEAT_XIM) && !defined(FEAT_GUI_GTK)) || defined(PROTO)
int int
im_get_status(void) im_get_status(void)
{ {
return hangul_input_state_get(); return hangul_input_state_get();
} }
#endif
void void
hangul_input_state_toggle(void) hangul_input_state_toggle(void)

View File

@@ -5848,6 +5848,11 @@ xim_queue_key_press_event(GdkEventKey *event, int down)
int int
im_get_status(void) im_get_status(void)
{ {
# ifdef FEAT_HANGULIN
if (hangul_input_state_get())
return TRUE;
# endif
# ifdef FEAT_EVAL # ifdef FEAT_EVAL
if (USE_IMSTATUSFUNC) if (USE_IMSTATUSFUNC)
return call_imstatusfunc(); return call_imstatusfunc();

View File

@@ -777,6 +777,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1647,
/**/ /**/
1646, 1646,
/**/ /**/