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

updated for version 7.0-225

This commit is contained in:
Bram Moolenaar
2007-04-26 08:54:21 +00:00
parent 63b9254b8e
commit 87c1996491
3 changed files with 11 additions and 1 deletions

View File

@@ -14397,7 +14397,8 @@ f_setline(argvars, rettv)
if (u_savesub(lnum) == OK && ml_replace(lnum, line, TRUE) == OK) if (u_savesub(lnum) == OK && ml_replace(lnum, line, TRUE) == OK)
{ {
changed_bytes(lnum, 0); changed_bytes(lnum, 0);
check_cursor_col(); if (lnum == curwin->w_cursor.lnum)
check_cursor_col();
rettv->vval.v_number = 0; /* OK */ rettv->vval.v_number = 0; /* OK */
} }
} }

View File

@@ -516,7 +516,14 @@ check_cursor_col()
|| virtual_active()) || virtual_active())
curwin->w_cursor.col = len; curwin->w_cursor.col = len;
else else
{
curwin->w_cursor.col = len - 1; curwin->w_cursor.col = len - 1;
#ifdef FEAT_MBYTE
/* prevent cursor from moving on the trail byte */
if (has_mbyte)
mb_adjust_cursor();
#endif
}
} }
#ifdef FEAT_VIRTUALEDIT #ifdef FEAT_VIRTUALEDIT

View File

@@ -666,6 +666,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 */
/**/
225,
/**/ /**/
224, 224,
/**/ /**/