OSDN > Find Software > Vim > SCM > hg > vim > Commit

Vim
Fork

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim

updated for version 7.0-044

diff -r 94164a5b0626 -r a07007166d51 src/if_perl.xs

--- a/src/if_perl.xs Tue Aug 08 14:29:16 2006 +0000

+++ b/src/if_perl.xs Tue Aug 08 14:45:44 2006 +0000

		@@ -1069,14 +1068,31 @@
1069	1068	line = SvPV(ST(i),PL_na);
1070	1069	if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
1071	1070	{
1072		- savebuf = curbuf;
	1071	+ #ifdef FEAT_AUTOCMD
	1072	+ aco_save_T aco;
	1073	+
	1074	+ /* set curwin/curbuf for "vimbuf" and save some things */
	1075	+ aucmd_prepbuf(&aco, vimbuf);
	1076	+ #else
	1077	+ buf_T *save_curbuf = curbuf;
	1078	+
1073	1079	curbuf = vimbuf;
	1080	+ curwin->w_buffer = vimbuf;
	1081	+ #endif
1074	1082	if (u_savesub(lnum) == OK)
1075	1083	{
1076	1084	ml_replace(lnum, (char_u *)line, TRUE);
1077	1085	changed_bytes(lnum, 0);
1078	1086	}
1079		- curbuf = savebuf;
	1087	+
	1088	+ #ifdef FEAT_AUTOCMD
	1089	+ /* restore curwin/curbuf and a few other things */
	1090	+ aucmd_restbuf(&aco);
	1091	+ /* Careful: autocommands may have made "vimbuf" invalid! */
	1092	+ #else
	1093	+ curwin->w_buffer = save_curbuf;
	1094	+ curbuf = save_curbuf;
	1095	+ #endif
1080	1096	}
1081	1097	}
1082	1098	}

		@@ -1114,16 +1129,31 @@
1114	1129	{
1115	1130	if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count)
1116	1131	{
1117		- savebuf = curbuf;
	1132	+ buf_T *save_curbuf = curbuf;
	1133	+ #ifdef FEAT_AUTOCMD
	1134	+ aco_save_T aco;
	1135	+
	1136	+ /* set curwin/curbuf for "vimbuf" and save some things */
	1137	+ aucmd_prepbuf(&aco, vimbuf);
	1138	+ #else
1118	1139	curbuf = vimbuf;
	1140	+ curwin->w_buffer = vimbuf;
	1141	+ #endif
1119	1142	if (u_savedel(lnum, 1) == OK)
1120	1143	{
1121	1144	ml_delete(lnum, 0);
1122	1145	deleted_lines_mark(lnum, 1L);
1123		- if (savebuf == curbuf)
	1146	+ if (save_curbuf == curbuf)
1124	1147	check_cursor();
1125	1148	}
1126		- curbuf = savebuf;
	1149	+ #ifdef FEAT_AUTOCMD
	1150	+ /* restore curwin/curbuf and a few other things */
	1151	+ aucmd_restbuf(&aco);
	1152	+ /* Careful: autocommands may have made "vimbuf" invalid! */
	1153	+ #else
	1154	+ curwin->w_buffer = save_curbuf;
	1155	+ curbuf = save_curbuf;
	1156	+ #endif
1127	1157	update_curbuf(VALID);
1128	1158	}
1129	1159	}

		@@ -1151,14 +1180,31 @@
1151	1180	line = SvPV(ST(i),PL_na);
1152	1181	if (lnum >= 0 && lnum <= vimbuf->b_ml.ml_line_count && line != NULL)
1153	1182	{
1154		- savebuf = curbuf;
	1183	+ #ifdef FEAT_AUTOCMD
	1184	+ aco_save_T aco;
	1185	+
	1186	+ /* set curwin/curbuf for "vimbuf" and save some things */
	1187	+ aucmd_prepbuf(&aco, vimbuf);
	1188	+ #else
	1189	+ buf_T *save_curbuf = curbuf;
	1190	+
1155	1191	curbuf = vimbuf;
	1192	+ curwin->w_buffer = vimbuf;
	1193	+ #endif
1156	1194	if (u_inssub(lnum + 1) == OK)
1157	1195	{
1158	1196	ml_append(lnum, (char_u *)line, (colnr_T)0, FALSE);
1159	1197	appended_lines_mark(lnum, 1L);
1160	1198	}
1161		- curbuf = savebuf;
	1199	+
	1200	+ #ifdef FEAT_AUTOCMD
	1201	+ /* restore curwin/curbuf and a few other things */
	1202	+ aucmd_restbuf(&aco);
	1203	+ /* Careful: autocommands may have made "vimbuf" invalid! */
	1204	+ #else
	1205	+ curwin->w_buffer = save_curbuf;
	1206	+ curbuf = save_curbuf;
	1207	+ #endif
1162	1208	update_curbuf(VALID);
1163	1209	}
1164	1210	}

diff -r 94164a5b0626 -r a07007166d51 src/version.c

--- a/src/version.c Tue Aug 08 14:29:16 2006 +0000

+++ b/src/version.c Tue Aug 08 14:45:44 2006 +0000

		@@ -667,6 +667,8 @@
667	667	static int included_patches[] =
668	668	{ /* Add new patch number below this line */
669	669	/**/
	670	+ 44,
	671	+/**/
670	672	43,
671	673	/**/
672	674	42,