aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/normal.c
diff options
context:
space:
mode:
authorThiago de Arruda <tpadilha84@gmail.com>2014-11-27 20:48:51 -0300
committerThiago de Arruda <tpadilha84@gmail.com>2014-11-27 20:48:51 -0300
commite5a386d2f819ee3a357384279d1a7810ec213087 (patch)
treecbb173280c736f89523b63a9c28429878131a995 /src/nvim/normal.c
parent98b11f5db3a99ef633ad77ddc6b22dc428873e95 (diff)
parent7b0f7ea87c71ad79dfd9e087b5992761533bef6e (diff)
downloadrneovim-e5a386d2f819ee3a357384279d1a7810ec213087.tar.gz
rneovim-e5a386d2f819ee3a357384279d1a7810ec213087.tar.bz2
rneovim-e5a386d2f819ee3a357384279d1a7810ec213087.zip
Merge PR #1568 'Remove code defined under USE_IM_CONTROL #ifdefs'
Diffstat (limited to 'src/nvim/normal.c')
-rw-r--r--src/nvim/normal.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 5202354199..843556bb49 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -717,9 +717,6 @@ getcount:
bool lit = false; /* get extra character literally */
bool langmap_active = false; /* using :lmap mappings */
int lang; /* getting a text character */
-#ifdef USE_IM_CONTROL
- bool save_smd; /* saved value of p_smd */
-#endif
++no_mapping;
++allow_keys; /* no mapping for nchar, but allow key codes */
@@ -768,12 +765,6 @@ getcount:
State = LANGMAP;
langmap_active = true;
}
-#ifdef USE_IM_CONTROL
- save_smd = p_smd;
- p_smd = false; /* Don't let the IM code show the mode here */
- if (lang && curbuf->b_p_iminsert == B_IMODE_IM)
- im_set_active(true);
-#endif
*cp = plain_vgetc();
@@ -783,14 +774,6 @@ getcount:
++allow_keys;
State = NORMAL_BUSY;
}
-#ifdef USE_IM_CONTROL
- if (lang) {
- if (curbuf->b_p_iminsert != B_IMODE_LMAP)
- im_save_status(&curbuf->b_p_iminsert);
- im_set_active(false);
- }
- p_smd = save_smd;
-#endif
State = NORMAL_BUSY;
need_flushbuf |= add_to_showcmd(*cp);