patch 8.2.3057: Vim9: debugger test fails with normal features and +terminal

Problem:    Vim9: debugger test fails with normal features and +terminal.
            (Dominique Pellé)
Solution:   Adjust the INSTRUCTIONS macro. (closes #8460)

diff --git a/src/version.c b/src/version.c
index 085801849b8b613bd97346e161e323be3ccc5bc8..6069a397b12be497605f15e79254c8ac78202eca 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3057,
 /**/
     3056,
 /**/

diff --git a/src/vim9.h b/src/vim9.h
index 97b9a3ea874b2d2cc010df0c47adfcbba0a6dfdd..b48a2f7c94048c84684ef2fef1926b3451b15c31 100644 (file)
--- a/src/vim9.h
+++ b/src/vim9.h
@@ -518,7 +518,7 @@ extern garray_T def_functions;
                : (dfunc)->df_instr))
 #else
 # define INSTRUCTIONS(dfunc) \
-       (debug_break_level > 0 \
+       (debug_break_level > 0 || dfunc->df_ufunc->uf_has_breakpoint \
                ? (dfunc)->df_instr_debug \
                : (dfunc)->df_instr)
 #endif