To: vim_dev@googlegroups.com Subject: Patch 8.2.2998 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2998 (after 8.2 2996) Problem: Vim9: disassemble test fails. Solution: Add missing call to lookup_debug_var(). Files: src/evalvars.c *** ../vim-8.2.2997/src/evalvars.c 2021-06-11 22:05:43.490401734 +0200 --- src/evalvars.c 2021-06-14 16:27:37.020809782 +0200 *************** *** 2571,2583 **** cc = name[len]; name[len] = NUL; ! // 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)) --- 2571,2587 ---- cc = name[len]; name[len] = NUL; ! // Check for local variable when debugging. ! if ((tv = lookup_debug_var(name)) == NULL) { ! // 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)) *** ../vim-8.2.2997/src/version.c 2021-06-14 21:08:52.924309067 +0200 --- src/version.c 2021-06-14 21:32:04.514839395 +0200 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2998, /**/ -- Managers are like cats in a litter box. They instinctively shuffle things around to conceal what they've done. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///