Mercurial > vim
comparison src/ops.c @ 50:90188be4861f
updated for version 7.0028
author | vimboss |
---|---|
date | Sun, 02 Jan 2005 11:36:03 +0000 |
parents | e474bae3795f |
children | 225cc00b2eda |
comparison
equal
deleted
inserted
replaced
49:10286edc333c | 50:90188be4861f |
---|---|
1528 * linewise. Don't do this for the change command or Visual mode. | 1528 * linewise. Don't do this for the change command or Visual mode. |
1529 */ | 1529 */ |
1530 if ( oap->motion_type == MCHAR | 1530 if ( oap->motion_type == MCHAR |
1531 #ifdef FEAT_VISUAL | 1531 #ifdef FEAT_VISUAL |
1532 && !oap->is_VIsual | 1532 && !oap->is_VIsual |
1533 && !oap->block_mode | |
1533 #endif | 1534 #endif |
1534 && oap->line_count > 1 | 1535 && oap->line_count > 1 |
1535 && oap->op_type == OP_DELETE) | 1536 && oap->op_type == OP_DELETE) |
1536 { | 1537 { |
1537 ptr = ml_get(oap->end.lnum) + oap->end.col + oap->inclusive; | 1538 ptr = ml_get(oap->end.lnum) + oap->end.col + oap->inclusive; |
2677 if ( oap->motion_type == MCHAR | 2678 if ( oap->motion_type == MCHAR |
2678 && oap->start.col == 0 | 2679 && oap->start.col == 0 |
2679 && !oap->inclusive | 2680 && !oap->inclusive |
2680 #ifdef FEAT_VISUAL | 2681 #ifdef FEAT_VISUAL |
2681 && (!oap->is_VIsual || *p_sel == 'o') | 2682 && (!oap->is_VIsual || *p_sel == 'o') |
2683 && !oap->block_mode | |
2682 #endif | 2684 #endif |
2683 && oap->end.col == 0 | 2685 && oap->end.col == 0 |
2684 && yanklines > 1) | 2686 && yanklines > 1) |
2685 { | 2687 { |
2686 yanktype = MLINE; | 2688 yanktype = MLINE; |
5995 char_count_cursor += line_count_info(s, | 5997 char_count_cursor += line_count_info(s, |
5996 &word_count_cursor, len, eol_size); | 5998 &word_count_cursor, len, eol_size); |
5997 if (lnum == curbuf->b_ml.ml_line_count | 5999 if (lnum == curbuf->b_ml.ml_line_count |
5998 && !curbuf->b_p_eol | 6000 && !curbuf->b_p_eol |
5999 && curbuf->b_p_bin | 6001 && curbuf->b_p_bin |
6000 && STRLEN(s) < len) | 6002 && (long)STRLEN(s) < len) |
6001 char_count_cursor -= eol_size; | 6003 char_count_cursor -= eol_size; |
6002 } | 6004 } |
6003 } | 6005 } |
6004 else | 6006 else |
6005 #endif | 6007 #endif |