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:
@@ -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)
|
||||
|
@@ -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();
|
||||
|
@@ -777,6 +777,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1647,
|
||||
/**/
|
||||
1646,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user