diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-06-14 21:32:21 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-06-14 21:32:21 +0200 |
| commit | 1b0a9dd413c03054f461a01531e010ad739617a7 (patch) | |
| tree | aa30a3d216e53ad9fb3a350b7956ac72d653bfca | |
| parent | 26d711645c12abb29bcaf410b4f02d700f62e799 (diff) | |
patch 8.2.2998: Vim9: disassemble test failsv8.2.2998
Problem: Vim9: disassemble test fails.
Solution: Add missing call to lookup_debug_var().
| -rw-r--r-- | src/evalvars.c | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/evalvars.c b/src/evalvars.c index cd1f1702ff..dc66eb6919 100644 --- a/src/evalvars.c +++ b/src/evalvars.c @@ -2571,13 +2571,17 @@ eval_variable( cc = name[len]; name[len] = NUL; - // Check for user-defined variables. - v = find_var(name, NULL, flags & EVAL_VAR_NOAUTOLOAD); - if (v != NULL) + // Check for local variable when debugging. + if ((tv = lookup_debug_var(name)) == NULL) { - tv = &v->di_tv; - if (dip != NULL) - *dip = v; + // Check for user-defined variables. + v = find_var(name, NULL, flags & EVAL_VAR_NOAUTOLOAD); + if (v != NULL) + { + tv = &v->di_tv; + if (dip != NULL) + *dip = v; + } } if (tv == NULL && (in_vim9script() || STRNCMP(name, "s:", 2) == 0)) diff --git a/src/version.c b/src/version.c index ee3db22710..05b4a519b4 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2998, +/**/ 2997, /**/ 2996, |