updated for version 7.0-120

diff --git a/src/ops.c b/src/ops.c
index 9e7927d9a25fad6d969b6739a921fe3786121094..be7091f489d977b4b091be250844b63f56ad57ba 100644 (file)
--- a/src/ops.c
+++ b/src/ops.c
@@ -770,6 +770,7 @@ get_expr_line()
 {
     char_u     *expr_copy;
     char_u     *rv;
+    static int nested = 0;
 
     if (expr_line == NULL)
        return NULL;
@@ -780,7 +781,14 @@ get_expr_line()
     if (expr_copy == 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);
+    --nested;
     vim_free(expr_copy);
     return rv;
 }

diff --git a/src/version.c b/src/version.c
index 31df517734c53c769a9642d64238ca395bd855a6..e3b6b73b93eb92c07f8139a3343181558b8629c7 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    120,
 /**/
     119,
 /**/