OSDN > Buscar 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-224

diff -r 537cb92935b6 -r 5a1d8468d1fa src/eval.c

--- a/src/eval.c Tue Mar 27 10:42:05 2007 +0000

+++ b/src/eval.c Tue Mar 27 14:57:09 2007 +0000

		@@ -8924,7 +8924,7 @@
8924	8924	if (s == '%' \|\| s == '#' \|\| *s == '<')
8925	8925	{
8926	8926	++emsg_off;
8927		- rettv->vval.v_string = eval_vars(s, &len, NULL, &errormsg, s);
	8927	+ rettv->vval.v_string = eval_vars(s, s, &len, NULL, &errormsg, NULL);
8928	8928	--emsg_off;
8929	8929	}
8930	8930	else

diff -r 537cb92935b6 -r 5a1d8468d1fa src/ex_docmd.c

--- a/src/ex_docmd.c Tue Mar 27 10:42:05 2007 +0000

+++ b/src/ex_docmd.c Tue Mar 27 14:57:09 2007 +0000

		@@ -4176,6 +4176,7 @@
4176	4176	int srclen;
4177	4177	char_u *p;
4178	4178	int n;
	4179	+ int escaped;
4179	4180
4180	4181	#ifdef FEAT_QUICKFIX
4181	4182	/* Skip a regexp pattern for ":vimgrep[add] pat file..." */

		@@ -4216,7 +4217,8 @@
4216	4217	/*
4217	4218	* Try to find a match at this position.
4218	4219	*/
4219		- repl = eval_vars(p, &srclen, &(eap->do_ecmd_lnum), errormsgp, eap->arg);
	4220	+ repl = eval_vars(p, eap->arg, &srclen, &(eap->do_ecmd_lnum),
	4221	+ errormsgp, &escaped);
4220	4222	if (errormsgp != NULL) / error detected */
4221	4223	return FAIL;
4222	4224	if (repl == NULL) /* no match found */

		@@ -4235,11 +4237,15 @@
4235	4237	vim_free(l);
4236	4238	}
4237	4239
4238		- /* Need to escape white space et al. with a backslash. Don't do this
4239		- * for shell commands (may have to use quotes instead). Don't do this
4240		- * for non-unix systems when there is a single argument (spaces don't
4241		- * separate arguments then). */
	4240	+ /* Need to escape white space et al. with a backslash.
	4241	+ * Don't do this for:
	4242	+ * - replacement that already has been escaped: "##"
	4243	+ * - shell commands (may have to use quotes instead).
	4244	+ * - non-unix systems when there is a single argument (spaces don't
	4245	+ * separate arguments then).
	4246	+ */
4242	4247	if (!eap->usefilter
	4248	+ && !escaped
4243	4249	&& eap->cmdidx != CMD_bang
4244	4250	&& eap->cmdidx != CMD_make
4245	4251	&& eap->cmdidx != CMD_lmake

		@@ -9280,12 +9286,14 @@
9280	9286	* number of characters to skip.
9281	9287	*/
9282	9288	char_u *
9283		-eval_vars(src, usedlen, lnump, errormsg, srcstart)
	9289	+eval_vars(src, srcstart, usedlen, lnump, errormsg, escaped)
9284	9290	char_u src; / pointer into commandline */
	9291	+ char_u srcstart; / beginning of valid memory for src */
9285	9292	int usedlen; / characters after src that are used */
9286	9293	linenr_T lnump; / line number for :e command, or NULL */
9287	9294	char_u *errormsg; / pointer to error message */
9288		- char_u srcstart; / beginning of valid memory for src */
	9295	+ int escaped; / return value has escaped white space (can
	9296	+ * be NULL) */
9289	9297	{
9290	9298	int i;
9291	9299	char_u *s;

		@@ -9332,6 +9340,8 @@
9332	9340	#endif
9333	9341
9334	9342	*errormsg = NULL;
	9343	+ if (escaped != NULL)
	9344	+ *escaped = FALSE;
9335	9345
9336	9346	/*
9337	9347	* Check if there is something to do.

		@@ -9627,7 +9639,7 @@
9627	9639	else
9628	9640	{
9629	9641	/* replace "<sfile>" with the sourced file name, and do ":" stuff */
9630		- repl = eval_vars(p, &srclen, NULL, &errormsg, result);
	9642	+ repl = eval_vars(p, result, &srclen, NULL, &errormsg, NULL);
9631	9643	if (errormsg != NULL)
9632	9644	{
9633	9645	if (*errormsg)

diff -r 537cb92935b6 -r 5a1d8468d1fa src/proto/ex_docmd.pro

--- a/src/proto/ex_docmd.pro Tue Mar 27 10:42:05 2007 +0000

+++ b/src/proto/ex_docmd.pro Tue Mar 27 14:57:09 2007 +0000

		@@ -44,7 +44,7 @@
44	44	extern FILE open_exfile __ARGS((char_u fname, int forceit, char *mode));
45	45	extern void update_topline_cursor __ARGS((void));
46	46	extern void exec_normal_cmd __ARGS((char_u *cmd, int remap, int silent));
47		-extern char_u eval_vars __ARGS((char_u src, int usedlen, linenr_T lnump, char_u *errormsg, char_u srcstart));
	47	+extern char_u eval_vars __ARGS((char_u src, char_u srcstart, int usedlen, linenr_T lnump, char_u errormsg, int escaped));
48	48	extern char_u expand_sfile __ARGS((char_u arg));
49	49	extern int put_eol __ARGS((FILE *fd));
50	50	extern int put_line __ARGS((FILE fd, char s));

diff -r 537cb92935b6 -r 5a1d8468d1fa src/version.c

--- a/src/version.c Tue Mar 27 10:42:05 2007 +0000

+++ b/src/version.c Tue Mar 27 14:57:09 2007 +0000

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