aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.2-011

Browse Source
This commit is contained in:
Bram Moolenaar 2008-09-07 11:55:43 +00:00
parent 3094a9e1a7
commit a85fb757a1
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/eval.c
View File

@ -1256,23 +1256,26 @@ skip_expr(pp)
/* /*
* Top level evaluation function, returning a string. * Top level evaluation function, returning a string.
* When "convert" is TRUE convert a List into a sequence of lines and convert
* a Float to a String.
* Return pointer to allocated memory, or NULL for failure. * Return pointer to allocated memory, or NULL for failure.
*/ */
char_u * char_u *
eval_to_string(arg, nextcmd, dolist) eval_to_string(arg, nextcmd, convert)
char_u *arg; char_u *arg;
char_u **nextcmd; char_u **nextcmd;
int dolist; /* turn List into sequence of lines */ int convert;
{ {
typval_T tv; typval_T tv;
char_u *retval; char_u *retval;
garray_T ga; garray_T ga;
char_u numbuf[NUMBUFLEN];
if (eval0(arg, &tv, nextcmd, TRUE) == FAIL) if (eval0(arg, &tv, nextcmd, TRUE) == FAIL)
retval = NULL; retval = NULL;
else else
{ {
if (dolist && tv.v_type == VAR_LIST) if (convert && tv.v_type == VAR_LIST)
{ {
ga_init2(&ga, (int)sizeof(char), 80); ga_init2(&ga, (int)sizeof(char), 80);
if (tv.vval.v_list != NULL) if (tv.vval.v_list != NULL)
@ -1280,6 +1283,13 @@ eval_to_string(arg, nextcmd, dolist)
ga_append(&ga, NUL); ga_append(&ga, NUL);
retval = (char_u *)ga.ga_data; retval = (char_u *)ga.ga_data;
} }
#ifdef FEAT_FLOAT
else if (convert && tv.v_type == VAR_FLOAT)
{
vim_snprintf((char *)numbuf, NUMBUFLEN, "%g", tv.vval.v_float);
retval = vim_strsave(numbuf);
}
#endif
else else
retval = vim_strsave(get_tv_string(&tv)); retval = vim_strsave(get_tv_string(&tv));
clear_tv(&tv); clear_tv(&tv);

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 */
/**/
11,
/**/ /**/
10, 10,
/**/ /**/