commit 307dec4567e0f64a7a4cfc2d5302d2aba26db775
author Bram Moolenaar <Bram@vim.org> Sat Jun 26 21:21:03 2021 +0200
committer Bram Moolenaar <Bram@vim.org> Sat Jun 26 21:21:03 2021 +0200
tree 85dfb066a1ebb0f48cf33bb35628461edd3e78a7
parent 14ded11fcad77ebf41032ec80a95d516ca9acb1c

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)

src/version.c

diff --git a/src/version.c b/src/version.c
index 0858018..6069a39 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3057,
+/**/
     3056,
 /**/
     3055,

src/vim9.h

diff --git a/src/vim9.h b/src/vim9.h
index 97b9a3e..b48a2f7 100644
--- a/src/vim9.h
+++ b/src/vim9.h
@@ -518,7 +518,7 @@
 		: (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