comparison src/edit.c @ 714:0f9f4761ad9c v7.0216

updated for version 7.0216
author vimboss
date Mon, 06 Mar 2006 23:29:24 +0000
parents 2e887dfa8917
children 8ae24f338cab
comparison
equal deleted inserted replaced
713:0c381fb7846c 714:0f9f4761ad9c
7602 colnr_T mincol; 7602 colnr_T mincol;
7603 int did_backspace = FALSE; 7603 int did_backspace = FALSE;
7604 int in_indent; 7604 int in_indent;
7605 int oldState; 7605 int oldState;
7606 #ifdef FEAT_MBYTE 7606 #ifdef FEAT_MBYTE
7607 int p1, p2; 7607 int cpc[MAX_MCO]; /* composing characters */
7608 #endif 7608 #endif
7609 7609
7610 /* 7610 /*
7611 * can't delete anything in an empty file 7611 * can't delete anything in an empty file
7612 * can't backup past first character in buffer 7612 * can't backup past first character in buffer
7918 replace_do_bs(); 7918 replace_do_bs();
7919 else 7919 else
7920 { 7920 {
7921 #ifdef FEAT_MBYTE 7921 #ifdef FEAT_MBYTE
7922 if (enc_utf8 && p_deco) 7922 if (enc_utf8 && p_deco)
7923 (void)utfc_ptr2char(ml_get_cursor(), &p1, &p2); 7923 (void)utfc_ptr2char(ml_get_cursor(), cpc);
7924 #endif 7924 #endif
7925 (void)del_char(FALSE); 7925 (void)del_char(FALSE);
7926 #ifdef FEAT_MBYTE 7926 #ifdef FEAT_MBYTE
7927 /* 7927 /*
7928 * If p1 or p2 is non-zero, there are combining characters we 7928 * If there are combining characters and 'delcombine' is set
7929 * need to take account of. Don't back up before the base 7929 * move the cursor back. Don't back up before the base
7930 * character. 7930 * character.
7931 */ 7931 */
7932 if (enc_utf8 && p_deco && (p1 != NUL || p2 != NUL)) 7932 if (enc_utf8 && p_deco && cpc[0] != NUL)
7933 inc_cursor(); 7933 inc_cursor();
7934 #endif 7934 #endif
7935 #ifdef FEAT_RIGHTLEFT 7935 #ifdef FEAT_RIGHTLEFT
7936 if (revins_chars) 7936 if (revins_chars)
7937 { 7937 {