From 3971905bac0fe7e7519b35b1e558b4f1de55708d Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 5 Sep 2017 22:20:46 +0200 Subject: patch 8.0.1060: when imstyle is one, mapping breaks preediting Problem: When imstyle is one, mapping breaks preediting. Solution: Pass though preediting key-events. (Yasuhiro Matsumoto, closes #2064, closes #2063) --- src/getchar.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/getchar.c') diff --git a/src/getchar.c b/src/getchar.c index 78bd39d81..63d6542bf 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -1598,8 +1598,13 @@ vgetc(void) { int did_inc = FALSE; - if (mod_mask) /* no mapping after modifier has been read */ + if (mod_mask +#if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) + || im_is_preediting() +#endif + ) { + /* no mapping after modifier has been read */ ++no_mapping; ++allow_keys; did_inc = TRUE; /* mod_mask may change value */ -- cgit v1.2.1