diff options
| author | Bram Moolenaar <bram@vim.org> | 2011-08-17 17:18:20 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2011-08-17 17:18:20 +0200 |
| commit | 0080491fbc5ff42062e99c5e07f04ab878dbfcbb (patch) | |
| tree | 7870d1a0ec8cafdcc41adba773431d33141dbffa | |
| parent | 9e02d16963e0fc853b42b3341d7b53a645b3fdb4 (diff) | |
| download | vim-0080491fbc5ff42062e99c5e07f04ab878dbfcbb.tar.gz | |
Problem: An expression mapping with a multi-byte character containing a
0x80 byte gets messed up. (ZyX)
Solution: Unescape the expression before evaluating it (Yukihiro Nakadaira)
| -rw-r--r-- | src/getchar.c | 20 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 19 insertions, 3 deletions
diff --git a/src/getchar.c b/src/getchar.c index 0437e94a..697eb314 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -3262,9 +3262,9 @@ do_map(maptype, arg, mode, abbrev) validate_maphash(); /* - * find end of keys and skip CTRL-Vs (and backslashes) in it + * Find end of keys and skip CTRL-Vs (and backslashes) in it. * Accept backslash like CTRL-V when 'cpoptions' does not contain 'B'. - * with :unmap white space is included in the keys, no argument possible + * with :unmap white space is included in the keys, no argument possible. */ p = keys; do_backslash = (vim_strchr(p_cpo, CPO_BSLASH) == NULL); @@ -4506,12 +4506,23 @@ eval_map_expr(str, c) { char_u *res; char_u *p; + char_u *expr; char_u *save_cmd; pos_T save_cursor; + /* Remove escaping of CSI, because "str" is in a format to be used as + * typeahead. */ + expr = vim_strsave(str); + if (expr == NULL) + return NULL; + vim_unescape_csi(expr); + save_cmd = save_cmdline_alloc(); if (save_cmd == NULL) + { + vim_free(expr); return NULL; + } /* Forbid changing text or using ":normal" to avoid most of the bad side * effects. Also restore the cursor position. */ @@ -4521,7 +4532,7 @@ eval_map_expr(str, c) #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); + p = eval_to_string(expr, NULL, FALSE); --textlock; #ifdef FEAT_EX_EXTRA --ex_normal_lock; @@ -4529,8 +4540,11 @@ eval_map_expr(str, c) curwin->w_cursor = save_cursor; restore_cmdline_alloc(save_cmd); + vim_free(expr); + if (p == NULL) return NULL; + /* Escape CSI in the result to be able to use the string as typeahead. */ res = vim_strsave_escape_csi(p); vim_free(p); diff --git a/src/version.c b/src/version.c index f9760e9a..b5fe5aa1 100644 --- a/src/version.c +++ b/src/version.c @@ -710,6 +710,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 283, +/**/ 282, /**/ 281, |