diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-03-06 23:29:24 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-03-06 23:29:24 +0000 |
| commit | 362e1a30c6f3527d5d0efc328c2fb448290cd6fc (patch) | |
| tree | 91c408352947bec09aee2032949ef1acef606d15 /src/misc1.c | |
| parent | 768b8c4dbcb3cdaccab87daa833ab176a438cc3c (diff) | |
updated for version 7.0216v7.0216
Diffstat (limited to 'src/misc1.c')
| -rw-r--r-- | src/misc1.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/misc1.c b/src/misc1.c index c9deb85fe8..f95d93d49b 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -2177,11 +2177,11 @@ del_bytes(count, fixpos, use_delcombine) if (p_deco && use_delcombine && enc_utf8 && utfc_ptr2len(oldp + col) >= count) { - int c1, c2; + int cc[MAX_MCO]; int n; - (void)utfc_ptr2char(oldp + col, &c1, &c2); - if (c1 != NUL) + (void)utfc_ptr2char(oldp + col, cc); + if (cc[0] != NUL) { /* Find the last composing char, there can be several. */ n = col; @@ -8056,6 +8056,7 @@ fast_breakcheck() /* * Expand wildcards. Calls gen_expand_wildcards() and removes files matching * 'wildignore'. + * Returns OK or FAIL. */ int expand_wildcards(num_pat, pat, num_file, file, flags) @@ -8898,7 +8899,7 @@ expand_backtick(gap, pat, flags) #ifdef FEAT_EVAL if (*cmd == '=') /* `={expr}`: Expand expression */ - buffer = eval_to_string(cmd + 1, &p); + buffer = eval_to_string(cmd + 1, &p, TRUE); else #endif buffer = get_cmd_output(cmd, NULL, |