diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-09-30 13:17:02 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-09-30 13:17:02 +0000 |
| commit | da9591ecfd31fab84e9fbca393b198e4de2de880 (patch) | |
| tree | 00528af3b2273cc6fd6e33db83d99c883701a3dc /src/getchar.c | |
| parent | becf428bc0ac7f7c5c1cc9e3213c025655c0beea (diff) | |
| download | vim-git-da9591ecfd31fab84e9fbca393b198e4de2de880.tar.gz | |
updated for version 7.2-266v7.2.266
Diffstat (limited to 'src/getchar.c')
| -rw-r--r-- | src/getchar.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/getchar.c b/src/getchar.c index e81f7cb56..b39ff74a3 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -129,7 +129,7 @@ static void map_free __ARGS((mapblock_T **)); static void validate_maphash __ARGS((void)); static void showmap __ARGS((mapblock_T *mp, int local)); #ifdef FEAT_EVAL -static char_u *eval_map_expr __ARGS((char_u *str)); +static char_u *eval_map_expr __ARGS((char_u *str, int c)); #endif /* @@ -2446,7 +2446,7 @@ vgetorpeek(advance) if (tabuf.typebuf_valid) { vgetc_busy = 0; - s = eval_map_expr(mp->m_str); + s = eval_map_expr(mp->m_str, NUL); vgetc_busy = save_vgetc_busy; } else @@ -4367,9 +4367,9 @@ check_abbr(c, ptr, col, mincol) * abbreviation, but is not inserted into the input stream. */ j = 0; - /* special key code, split up */ if (c != Ctrl_RSB) { + /* special key code, split up */ if (IS_SPECIAL(c) || c == K_SPECIAL) { tb[j++] = K_SPECIAL; @@ -4398,7 +4398,7 @@ check_abbr(c, ptr, col, mincol) } #ifdef FEAT_EVAL if (mp->m_expr) - s = eval_map_expr(mp->m_str); + s = eval_map_expr(mp->m_str, c); else #endif s = mp->m_str; @@ -4434,8 +4434,9 @@ check_abbr(c, ptr, col, mincol) * special characters. */ static char_u * -eval_map_expr(str) +eval_map_expr(str, c) char_u *str; + int c; /* NUL or typed character for abbreviation */ { char_u *res; char_u *p; @@ -4452,6 +4453,7 @@ eval_map_expr(str) #ifdef FEAT_EX_EXTRA ++ex_normal_lock; #endif + set_vim_var_char(c); /* set v:char to the typed character */ save_cursor = curwin->w_cursor; p = eval_to_string(str, NULL, FALSE); --textlock; |