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/edit.c | |
| parent | 768b8c4dbcb3cdaccab87daa833ab176a438cc3c (diff) | |
| download | vim-git-362e1a30c6f3527d5d0efc328c2fb448290cd6fc.tar.gz | |
updated for version 7.0216v7.0216
Diffstat (limited to 'src/edit.c')
| -rw-r--r-- | src/edit.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/edit.c b/src/edit.c index 3ad12a7a6..3a7a8ced6 100644 --- a/src/edit.c +++ b/src/edit.c @@ -7604,7 +7604,7 @@ ins_bs(c, mode, inserted_space_p) int in_indent; int oldState; #ifdef FEAT_MBYTE - int p1, p2; + int cpc[MAX_MCO]; /* composing characters */ #endif /* @@ -7920,16 +7920,16 @@ ins_bs(c, mode, inserted_space_p) { #ifdef FEAT_MBYTE if (enc_utf8 && p_deco) - (void)utfc_ptr2char(ml_get_cursor(), &p1, &p2); + (void)utfc_ptr2char(ml_get_cursor(), cpc); #endif (void)del_char(FALSE); #ifdef FEAT_MBYTE /* - * If p1 or p2 is non-zero, there are combining characters we - * need to take account of. Don't back up before the base + * If there are combining characters and 'delcombine' is set + * move the cursor back. Don't back up before the base * character. */ - if (enc_utf8 && p_deco && (p1 != NUL || p2 != NUL)) + if (enc_utf8 && p_deco && cpc[0] != NUL) inc_cursor(); #endif #ifdef FEAT_RIGHTLEFT |