summaryrefslogtreecommitdiffstats
path: root/src/getchar.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-09-05 22:20:46 +0200
committerBram Moolenaar <Bram@vim.org>2017-09-05 22:20:46 +0200
commit3971905bac0fe7e7519b35b1e558b4f1de55708d (patch)
treec56cf0e879a0e52426e349e693a37507744a2eb8 /src/getchar.c
parent3d8d2c7ca5dda5bfd62c6d5df6659cf62e960a3d (diff)
patch 8.0.1060: when imstyle is one, mapping <Left> breaks preeditingv8.0.1060
Problem: When imstyle is one, mapping <Left> breaks preediting. Solution: Pass though preediting key-events. (Yasuhiro Matsumoto, closes #2064, closes #2063)
Diffstat (limited to 'src/getchar.c')
-rw-r--r--src/getchar.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/getchar.c b/src/getchar.c
index 78bd39d81b..63d6542bfe 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 */