forked from aniani/vim
updated for version 7.0-051
This commit is contained in:
@@ -1068,31 +1068,30 @@ Set(vimbuf, ...)
|
|||||||
line = SvPV(ST(i),PL_na);
|
line = SvPV(ST(i),PL_na);
|
||||||
if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
|
if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
|
||||||
{
|
{
|
||||||
#ifdef FEAT_AUTOCMD
|
#ifdef FEAT_AUTOCMD
|
||||||
aco_save_T aco;
|
aco_save_T aco;
|
||||||
|
|
||||||
/* set curwin/curbuf for "vimbuf" and save some things */
|
/* set curwin/curbuf for "vimbuf" and save some things */
|
||||||
aucmd_prepbuf(&aco, vimbuf);
|
aucmd_prepbuf(&aco, vimbuf);
|
||||||
#else
|
#else
|
||||||
buf_T *save_curbuf = curbuf;
|
buf_T *save_curbuf = curbuf;
|
||||||
|
|
||||||
curbuf = vimbuf;
|
curbuf = vimbuf;
|
||||||
curwin->w_buffer = vimbuf;
|
curwin->w_buffer = vimbuf;
|
||||||
#endif
|
#endif
|
||||||
if (u_savesub(lnum) == OK)
|
if (u_savesub(lnum) == OK)
|
||||||
{
|
{
|
||||||
ml_replace(lnum, (char_u *)line, TRUE);
|
ml_replace(lnum, (char_u *)line, TRUE);
|
||||||
changed_bytes(lnum, 0);
|
changed_bytes(lnum, 0);
|
||||||
}
|
}
|
||||||
|
#ifdef FEAT_AUTOCMD
|
||||||
#ifdef FEAT_AUTOCMD
|
|
||||||
/* restore curwin/curbuf and a few other things */
|
/* restore curwin/curbuf and a few other things */
|
||||||
aucmd_restbuf(&aco);
|
aucmd_restbuf(&aco);
|
||||||
/* Careful: autocommands may have made "vimbuf" invalid! */
|
/* Careful: autocommands may have made "vimbuf" invalid! */
|
||||||
#else
|
#else
|
||||||
curwin->w_buffer = save_curbuf;
|
curwin->w_buffer = save_curbuf;
|
||||||
curbuf = save_curbuf;
|
curbuf = save_curbuf;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1130,15 +1129,15 @@ Delete(vimbuf, ...)
|
|||||||
if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count)
|
if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count)
|
||||||
{
|
{
|
||||||
buf_T *save_curbuf = curbuf;
|
buf_T *save_curbuf = curbuf;
|
||||||
#ifdef FEAT_AUTOCMD
|
#ifdef FEAT_AUTOCMD
|
||||||
aco_save_T aco;
|
aco_save_T aco;
|
||||||
|
|
||||||
/* set curwin/curbuf for "vimbuf" and save some things */
|
/* set curwin/curbuf for "vimbuf" and save some things */
|
||||||
aucmd_prepbuf(&aco, vimbuf);
|
aucmd_prepbuf(&aco, vimbuf);
|
||||||
#else
|
#else
|
||||||
curbuf = vimbuf;
|
curbuf = vimbuf;
|
||||||
curwin->w_buffer = vimbuf;
|
curwin->w_buffer = vimbuf;
|
||||||
#endif
|
#endif
|
||||||
if (u_savedel(lnum, 1) == OK)
|
if (u_savedel(lnum, 1) == OK)
|
||||||
{
|
{
|
||||||
ml_delete(lnum, 0);
|
ml_delete(lnum, 0);
|
||||||
@@ -1146,14 +1145,14 @@ Delete(vimbuf, ...)
|
|||||||
if (save_curbuf == curbuf)
|
if (save_curbuf == curbuf)
|
||||||
check_cursor();
|
check_cursor();
|
||||||
}
|
}
|
||||||
#ifdef FEAT_AUTOCMD
|
#ifdef FEAT_AUTOCMD
|
||||||
/* restore curwin/curbuf and a few other things */
|
/* restore curwin/curbuf and a few other things */
|
||||||
aucmd_restbuf(&aco);
|
aucmd_restbuf(&aco);
|
||||||
/* Careful: autocommands may have made "vimbuf" invalid! */
|
/* Careful: autocommands may have made "vimbuf" invalid! */
|
||||||
#else
|
#else
|
||||||
curwin->w_buffer = save_curbuf;
|
curwin->w_buffer = save_curbuf;
|
||||||
curbuf = save_curbuf;
|
curbuf = save_curbuf;
|
||||||
#endif
|
#endif
|
||||||
update_curbuf(VALID);
|
update_curbuf(VALID);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1180,31 +1179,30 @@ Append(vimbuf, ...)
|
|||||||
line = SvPV(ST(i),PL_na);
|
line = SvPV(ST(i),PL_na);
|
||||||
if (lnum >= 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
|
if (lnum >= 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
|
||||||
{
|
{
|
||||||
#ifdef FEAT_AUTOCMD
|
#ifdef FEAT_AUTOCMD
|
||||||
aco_save_T aco;
|
aco_save_T aco;
|
||||||
|
|
||||||
/* set curwin/curbuf for "vimbuf" and save some things */
|
/* set curwin/curbuf for "vimbuf" and save some things */
|
||||||
aucmd_prepbuf(&aco, vimbuf);
|
aucmd_prepbuf(&aco, vimbuf);
|
||||||
#else
|
#else
|
||||||
buf_T *save_curbuf = curbuf;
|
buf_T *save_curbuf = curbuf;
|
||||||
|
|
||||||
curbuf = vimbuf;
|
curbuf = vimbuf;
|
||||||
curwin->w_buffer = vimbuf;
|
curwin->w_buffer = vimbuf;
|
||||||
#endif
|
#endif
|
||||||
if (u_inssub(lnum + 1) == OK)
|
if (u_inssub(lnum + 1) == OK)
|
||||||
{
|
{
|
||||||
ml_append(lnum, (char_u *)line, (colnr_T)0, FALSE);
|
ml_append(lnum, (char_u *)line, (colnr_T)0, FALSE);
|
||||||
appended_lines_mark(lnum, 1L);
|
appended_lines_mark(lnum, 1L);
|
||||||
}
|
}
|
||||||
|
#ifdef FEAT_AUTOCMD
|
||||||
#ifdef FEAT_AUTOCMD
|
|
||||||
/* restore curwin/curbuf and a few other things */
|
/* restore curwin/curbuf and a few other things */
|
||||||
aucmd_restbuf(&aco);
|
aucmd_restbuf(&aco);
|
||||||
/* Careful: autocommands may have made "vimbuf" invalid! */
|
/* Careful: autocommands may have made "vimbuf" invalid! */
|
||||||
#else
|
#else
|
||||||
curwin->w_buffer = save_curbuf;
|
curwin->w_buffer = save_curbuf;
|
||||||
curbuf = save_curbuf;
|
curbuf = save_curbuf;
|
||||||
#endif
|
#endif
|
||||||
update_curbuf(VALID);
|
update_curbuf(VALID);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -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 */
|
||||||
|
/**/
|
||||||
|
51,
|
||||||
/**/
|
/**/
|
||||||
50,
|
50,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user