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

updated for version 7.0216

This commit is contained in:
Bram Moolenaar
2006-03-06 23:29:24 +00:00
parent 768b8c4dbc
commit 362e1a30c6
95 changed files with 9798 additions and 1335 deletions

View File

@@ -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