Skip to content

Commit d84b2c3

Browse files
committed
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)
1 parent 56a6312 commit d84b2c3

3 files changed

Lines changed: 9 additions & 0 deletions

File tree

src/hangulin.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,11 +404,13 @@ hangul_input_state_set(int state)
404404
hangul_input_clear();
405405
}
406406

407+
#if (!defined(FEAT_XIM) && !defined(FEAT_GUI_GTK)) || defined(PROTO)
407408
int
408409
im_get_status(void)
409410
{
410411
return hangul_input_state_get();
411412
}
413+
#endif
412414

413415
void
414416
hangul_input_state_toggle(void)

src/mbyte.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5848,6 +5848,11 @@ xim_queue_key_press_event(GdkEventKey *event, int down)
58485848
int
58495849
im_get_status(void)
58505850
{
5851+
# ifdef FEAT_HANGULIN
5852+
if (hangul_input_state_get())
5853+
return TRUE;
5854+
# endif
5855+
58515856
# ifdef FEAT_EVAL
58525857
if (USE_IMSTATUSFUNC)
58535858
return call_imstatusfunc();

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,8 @@ static char *(features[]) =
777777

778778
static int included_patches[] =
779779
{ /* Add new patch number below this line */
780+
/**/
781+
1647,
780782
/**/
781783
1646,
782784
/**/

0 commit comments

Comments
 (0)