thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.2-273

Browse Source
This commit is contained in:
Bram Moolenaar
2009-11-03 13:26:55 +00:00
parent d0ba34a6e5
commit 2f59b5c1cc
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/eval.c
View File

@@ -988,13 +988,14 @@ var_redir_start(name, append)
int err; int err;
typval_T tv; typval_T tv;
/* Make sure a valid variable name is specified */ /* Catch a bad name early. */
if (!eval_isnamec1(*name)) if (!eval_isnamec1(*name))
{ {
EMSG(_(e_invarg)); EMSG(_(e_invarg));
return FAIL; return FAIL;
} }
/* Make a copy of the name, it is used in redir_lval until redir ends. */
redir_varname = vim_strsave(name); redir_varname = vim_strsave(name);
if (redir_varname == NULL) if (redir_varname == NULL)
return FAIL; return FAIL;
@@ -1019,6 +1020,7 @@ var_redir_start(name, append)
EMSG(_(e_trailing)); EMSG(_(e_trailing));
else else
EMSG(_(e_invarg)); EMSG(_(e_invarg));
redir_endp = NULL; /* don't store a value, only cleanup */
var_redir_stop(); var_redir_stop();
return FAIL; return FAIL;
} }
@@ -1037,6 +1039,7 @@ var_redir_start(name, append)
did_emsg |= save_emsg; did_emsg |= save_emsg;
if (err) if (err)
{ {
redir_endp = NULL; /* don't store a value, only cleanup */
var_redir_stop(); var_redir_stop();
return FAIL; return FAIL;
} }
@@ -1085,6 +1088,7 @@ var_redir_str(value, value_len)
/* /*
* Stop redirecting command output to a variable. * Stop redirecting command output to a variable.
* Frees the allocated memory.
*/ */
void void
var_redir_stop() var_redir_stop()
@@ -1093,14 +1097,18 @@ var_redir_stop()
if (redir_lval != NULL) if (redir_lval != NULL)
{ {
/* Append the trailing NUL. */ /* If there was no error: assign the text to the variable. */
ga_append(&redir_ga, NUL); if (redir_endp != NULL)
{
ga_append(&redir_ga, NUL); /* Append the trailing NUL. */
tv.v_type = VAR_STRING;
tv.vval.v_string = redir_ga.ga_data;
set_var_lval(redir_lval, redir_endp, &tv, FALSE, (char_u *)".");
}
/* Assign the text to the variable. */ /* free the collected output */
tv.v_type = VAR_STRING; vim_free(redir_ga.ga_data);
tv.vval.v_string = redir_ga.ga_data; redir_ga.ga_data = NULL;
set_var_lval(redir_lval, redir_endp, &tv, FALSE, (char_u *)".");
vim_free(tv.vval.v_string);
clear_lval(redir_lval); clear_lval(redir_lval);
vim_free(redir_lval); vim_free(redir_lval);

2
src/version.c
View File

@@ -676,6 +676,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 */
/**/
273,
/**/ /**/
272, 272,
/**/ /**/