aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-05 05:34:07 -04:00
Code Activity

updated for version 7.0-044

Browse Source
This commit is contained in:
Bram Moolenaar
2006-08-08 14:45:44 +00:00
parent 3709e7c885
commit 334a3bfb0d
2 changed files with 58 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/if_perl.xs
View File

@@ -1056,7 +1056,6 @@ Set(vimbuf, ...)
int i; int i;
long lnum; long lnum;
char *line; char *line;
buf_T *savebuf;
PPCODE: PPCODE:
if (buf_valid(vimbuf)) if (buf_valid(vimbuf))
{ {
@@ -1069,14 +1068,31 @@ 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)
{ {
savebuf = curbuf; #ifdef FEAT_AUTOCMD
aco_save_T aco;
/* set curwin/curbuf for "vimbuf" and save some things */
aucmd_prepbuf(&aco, vimbuf);
#else
buf_T *save_curbuf = curbuf;
curbuf = vimbuf; curbuf = vimbuf;
curwin->w_buffer = vimbuf;
#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);
} }
curbuf = savebuf;
#ifdef FEAT_AUTOCMD
/* restore curwin/curbuf and a few other things */
aucmd_restbuf(&aco);
/* Careful: autocommands may have made "vimbuf" invalid! */
#else
curwin->w_buffer = save_curbuf;
curbuf = save_curbuf;
#endif
} }
} }
} }
@@ -1087,7 +1103,6 @@ Delete(vimbuf, ...)
PREINIT: PREINIT:
long i, lnum = 0, count = 0; long i, lnum = 0, count = 0;
buf_T *savebuf;
PPCODE: PPCODE:
if (buf_valid(vimbuf)) if (buf_valid(vimbuf))
{ {
@@ -1114,16 +1129,31 @@ Delete(vimbuf, ...)
{ {
if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count) if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count)
{ {
savebuf = curbuf; buf_T *save_curbuf = curbuf;
#ifdef FEAT_AUTOCMD
aco_save_T aco;
/* set curwin/curbuf for "vimbuf" and save some things */
aucmd_prepbuf(&aco, vimbuf);
#else
curbuf = vimbuf; curbuf = vimbuf;
curwin->w_buffer = vimbuf;
#endif
if (u_savedel(lnum, 1) == OK) if (u_savedel(lnum, 1) == OK)
{ {
ml_delete(lnum, 0); ml_delete(lnum, 0);
deleted_lines_mark(lnum, 1L); deleted_lines_mark(lnum, 1L);
if (savebuf == curbuf) if (save_curbuf == curbuf)
check_cursor(); check_cursor();
} }
curbuf = savebuf; #ifdef FEAT_AUTOCMD
/* restore curwin/curbuf and a few other things */
aucmd_restbuf(&aco);
/* Careful: autocommands may have made "vimbuf" invalid! */
#else
curwin->w_buffer = save_curbuf;
curbuf = save_curbuf;
#endif
update_curbuf(VALID); update_curbuf(VALID);
} }
} }
@@ -1138,7 +1168,6 @@ Append(vimbuf, ...)
int i; int i;
long lnum; long lnum;
char *line; char *line;
buf_T *savebuf;
PPCODE: PPCODE:
if (buf_valid(vimbuf)) if (buf_valid(vimbuf))
{ {
@@ -1151,14 +1180,31 @@ 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)
{ {
savebuf = curbuf; #ifdef FEAT_AUTOCMD
aco_save_T aco;
/* set curwin/curbuf for "vimbuf" and save some things */
aucmd_prepbuf(&aco, vimbuf);
#else
buf_T *save_curbuf = curbuf;
curbuf = vimbuf; curbuf = vimbuf;
curwin->w_buffer = vimbuf;
#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);
} }
curbuf = savebuf;
#ifdef FEAT_AUTOCMD
/* restore curwin/curbuf and a few other things */
aucmd_restbuf(&aco);
/* Careful: autocommands may have made "vimbuf" invalid! */
#else
curwin->w_buffer = save_curbuf;
curbuf = save_curbuf;
#endif
update_curbuf(VALID); update_curbuf(VALID);
} }
} }

2
src/version.c
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 */
/**/
44,
/**/ /**/
43, 43,
/**/ /**/