aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.2-279

Browse Source
This commit is contained in:
Bram Moolenaar 2009-11-03 15:44:21 +00:00
parent 5b88ba47e8
commit a1381de5f3
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/misc2.c
View File

@ -156,7 +156,7 @@ coladvance2(pos, addspaces, finetune, wcol)
|| ((ve_flags & VE_ONEMORE) && wcol < MAXCOL) || ((ve_flags & VE_ONEMORE) && wcol < MAXCOL)
#endif #endif
; ;
line = ml_get_curline(); line = ml_get_buf(curbuf, pos->lnum, FALSE);
if (wcol >= MAXCOL) if (wcol >= MAXCOL)
{ {
@ -332,9 +332,9 @@ coladvance2(pos, addspaces, finetune, wcol)
#endif #endif
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
/* prevent cursor from moving on the trail byte */ /* prevent from moving onto a trail byte */
if (has_mbyte) if (has_mbyte)
mb_adjust_cursor(); mb_adjustpos(pos);
#endif #endif
if (col < wcol) if (col < wcol)

7
src/ops.c
View File

@ -2020,6 +2020,7 @@ op_replace(oap, c)
bd.is_MAX = (curwin->w_curswant == MAXCOL); bd.is_MAX = (curwin->w_curswant == MAXCOL);
for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum) for ( ; curwin->w_cursor.lnum <= oap->end.lnum; ++curwin->w_cursor.lnum)
{ {
curwin->w_cursor.col = 0; /* make sure cursor position is valid */
block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE); block_prep(oap, &bd, curwin->w_cursor.lnum, TRUE);
if (bd.textlen == 0 && (!virtual_op || bd.is_MAX)) if (bd.textlen == 0 && (!virtual_op || bd.is_MAX))
continue; /* nothing to replace */ continue; /* nothing to replace */
@ -2035,6 +2036,7 @@ op_replace(oap, c)
{ {
pos_T vpos; pos_T vpos;
vpos.lnum = curwin->w_cursor.lnum;
getvpos(&vpos, oap->start_vcol); getvpos(&vpos, oap->start_vcol);
bd.startspaces += vpos.coladd; bd.startspaces += vpos.coladd;
n = bd.startspaces; n = bd.startspaces;
@ -2693,11 +2695,8 @@ op_change(oap)
* initial coladd offset as part of "startspaces" */ * initial coladd offset as part of "startspaces" */
if (bd.is_short) if (bd.is_short)
{ {
linenr_T lnum = curwin->w_cursor.lnum; vpos.lnum = linenr;
curwin->w_cursor.lnum = linenr;
(void)getvpos(&vpos, oap->start_vcol); (void)getvpos(&vpos, oap->start_vcol);
curwin->w_cursor.lnum = lnum;
} }
else else
vpos.coladd = 0; vpos.coladd = 0;

2
src/version.c
View File

@ -676,6 +676,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
279,
/**/ /**/
278, 278,
/**/ /**/