Skip to content

Commit 3971905

Browse files
committed
patch 8.0.1060: when imstyle is one, mapping <Left> breaks preediting
Problem: When imstyle is one, mapping <Left> breaks preediting. Solution: Pass though preediting key-events. (Yasuhiro Matsumoto, closes #2064, closes #2063)
1 parent 3d8d2c7 commit 3971905

3 files changed

Lines changed: 13 additions & 2 deletions

File tree

src/getchar.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1598,8 +1598,13 @@ vgetc(void)
15981598
{
15991599
int did_inc = FALSE;
16001600

1601-
if (mod_mask) /* no mapping after modifier has been read */
1601+
if (mod_mask
1602+
#if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
1603+
|| im_is_preediting()
1604+
#endif
1605+
)
16021606
{
1607+
/* no mapping after modifier has been read */
16031608
++no_mapping;
16041609
++allow_keys;
16051610
did_inc = TRUE; /* mod_mask may change value */

src/mbyte.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4964,7 +4964,11 @@ im_delete_preedit(void)
49644964
return;
49654965
}
49664966

4967-
if (State & NORMAL)
4967+
if (State & NORMAL
4968+
#ifdef FEAT_TERMINAL
4969+
&& !term_use_loop()
4970+
#endif
4971+
)
49684972
{
49694973
im_preedit_cursor = 0;
49704974
return;

src/version.c

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

770770
static int included_patches[] =
771771
{ /* Add new patch number below this line */
772+
/**/
773+
1060,
772774
/**/
773775
1059,
774776
/**/

0 commit comments

Comments
 (0)