0
0
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00

updated for version 7.0-120

This commit is contained in:
Bram Moolenaar
2006-10-06 21:33:16 +00:00
parent c0a0ab5c54
commit 21bffa7550
2 changed files with 10 additions and 0 deletions

View File

@@ -770,6 +770,7 @@ get_expr_line()
{ {
char_u *expr_copy; char_u *expr_copy;
char_u *rv; char_u *rv;
static int nested = 0;
if (expr_line == NULL) if (expr_line == NULL)
return NULL; return NULL;
@@ -780,7 +781,14 @@ get_expr_line()
if (expr_copy == NULL) if (expr_copy == NULL)
return NULL; return NULL;
/* When we are invoked recursively limit the evaluation to 10 levels.
* Then return the string as-is. */
if (nested >= 10)
return expr_copy;
++nested;
rv = eval_to_string(expr_copy, NULL, TRUE); rv = eval_to_string(expr_copy, NULL, TRUE);
--nested;
vim_free(expr_copy); vim_free(expr_copy);
return rv; return rv;
} }

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 */
/**/
120,
/**/ /**/
119, 119,
/**/ /**/