From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 26 Jun 2021 19:21:03 +0000 (+0200)
Subject: patch 8.2.3057: Vim9: debugger test fails with normal features and +terminal
X-Git-Tag: v8.2.3057
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=307dec4567e0f64a7a4cfc2d5302d2aba26db775;p=vim

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 085801849..6069a397b 100644
--- 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 97b9a3ea8..b48a2f7c9 100644
--- 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