Skip to content

Commit 1b0a9dd

Browse files
committed
patch 8.2.2998: Vim9: disassemble test fails
Problem: Vim9: disassemble test fails. Solution: Add missing call to lookup_debug_var().
1 parent 26d7116 commit 1b0a9dd

2 files changed

Lines changed: 12 additions & 6 deletions

File tree

src/evalvars.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2571,13 +2571,17 @@ eval_variable(
25712571
cc = name[len];
25722572
name[len] = NUL;
25732573

2574-
// Check for user-defined variables.
2575-
v = find_var(name, NULL, flags & EVAL_VAR_NOAUTOLOAD);
2576-
if (v != NULL)
2574+
// Check for local variable when debugging.
2575+
if ((tv = lookup_debug_var(name)) == NULL)
25772576
{
2578-
tv = &v->di_tv;
2579-
if (dip != NULL)
2580-
*dip = v;
2577+
// Check for user-defined variables.
2578+
v = find_var(name, NULL, flags & EVAL_VAR_NOAUTOLOAD);
2579+
if (v != NULL)
2580+
{
2581+
tv = &v->di_tv;
2582+
if (dip != NULL)
2583+
*dip = v;
2584+
}
25812585
}
25822586

25832587
if (tv == NULL && (in_vim9script() || STRNCMP(name, "s:", 2) == 0))

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -750,6 +750,8 @@ static char *(features[]) =
750750

751751
static int included_patches[] =
752752
{ /* Add new patch number below this line */
753+
/**/
754+
2998,
753755
/**/
754756
2997,
755757
/**/

0 commit comments

Comments
 (0)