0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

updated for version 7.2-109

This commit is contained in:
Bram Moolenaar
2009-02-21 19:28:48 +00:00
parent f69d9a354b
commit 28e8d27868
8 changed files with 129 additions and 40 deletions

View File

@@ -651,10 +651,7 @@ normal_cmd(oap, toplevel)
* Get the command character from the user.
*/
c = safe_vgetc();
#ifdef FEAT_LANGMAP
LANGMAP_ADJUST(c, TRUE);
#endif
#ifdef FEAT_VISUAL
/*
@@ -744,9 +741,7 @@ getcount:
}
++no_zero_mapping; /* don't map zero here */
c = plain_vgetc();
#ifdef FEAT_LANGMAP
LANGMAP_ADJUST(c, TRUE);
#endif
--no_zero_mapping;
if (ctrl_w)
{
@@ -769,9 +764,7 @@ getcount:
++no_mapping;
++allow_keys; /* no mapping for nchar, but keys */
c = plain_vgetc(); /* get next character */
#ifdef FEAT_LANGMAP
LANGMAP_ADJUST(c, TRUE);
#endif
--no_mapping;
--allow_keys;
#ifdef FEAT_CMDL_INFO
@@ -959,9 +952,7 @@ getcount:
* "gr", "g'" and "g`".
*/
ca.nchar = plain_vgetc();
#ifdef FEAT_LANGMAP
LANGMAP_ADJUST(ca.nchar, TRUE);
#endif
#ifdef FEAT_CMDL_INFO
need_flushbuf |= add_to_showcmd(ca.nchar);
#endif
@@ -1062,10 +1053,8 @@ getcount:
}
#endif
#ifdef FEAT_LANGMAP
/* adjust chars > 127, except after "tTfFr" commands */
LANGMAP_ADJUST(*cp, !lang);
#endif
#ifdef FEAT_RIGHTLEFT
/* adjust Hebrew mapped char */
if (p_hkmap && lang && KeyTyped)
@@ -4630,9 +4619,7 @@ nv_zet(cap)
++no_mapping;
++allow_keys; /* no mapping for nchar, but allow key codes */
nchar = plain_vgetc();
#ifdef FEAT_LANGMAP
LANGMAP_ADJUST(nchar, TRUE);
#endif
--no_mapping;
--allow_keys;
#ifdef FEAT_CMDL_INFO
@@ -4988,9 +4975,7 @@ dozet:
++no_mapping;
++allow_keys; /* no mapping for nchar, but allow key codes */
nchar = plain_vgetc();
#ifdef FEAT_LANGMAP
LANGMAP_ADJUST(nchar, TRUE);
#endif
--no_mapping;
--allow_keys;
#ifdef FEAT_CMDL_INFO