0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

updated for version 7.0027

This commit is contained in:
Bram Moolenaar
2004-12-31 20:58:58 +00:00
parent dfccaf0f00
commit def9e829de
9 changed files with 117 additions and 35 deletions

View File

@@ -5958,6 +5958,9 @@ cursor_pos_info()
if (VIsual_active
&& lnum >= min_pos.lnum && lnum <= max_pos.lnum)
{
char_u *s = NULL;
long len = 0L;
switch (VIsual_mode)
{
case Ctrl_V:
@@ -5968,12 +5971,12 @@ cursor_pos_info()
# ifdef FEAT_VIRTUALEDIT
virtual_op = MAYBE;
# endif
char_count_cursor += line_count_info(bd.textstart,
&word_count_cursor, (long)bd.textlen, eol_size);
s = bd.textstart;
len = (long)bd.textlen;
break;
case 'V':
char_count_cursor += line_count_info(ml_get(lnum),
&word_count_cursor, (long)MAXCOL, eol_size);
s = ml_get(lnum);
len = MAXCOL;
break;
case 'v':
{
@@ -5982,12 +5985,21 @@ cursor_pos_info()
colnr_T end_col = (lnum == max_pos.lnum)
? max_pos.col - start_col + 1 : MAXCOL;
char_count_cursor +=
line_count_info(ml_get(lnum) + start_col,
&word_count_cursor, (long)end_col, eol_size);
s = ml_get(lnum) + start_col;
len = end_col;
}
break;
}
if (s != NULL)
{
char_count_cursor += line_count_info(s,
&word_count_cursor, len, eol_size);
if (lnum == curbuf->b_ml.ml_line_count
&& !curbuf->b_p_eol
&& curbuf->b_p_bin
&& STRLEN(s) < len)
char_count_cursor -= eol_size;
}
}
else
#endif