# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1624735803 -7200
# Node ID 7901481ea280de0555a7d99773e13ad640fc0dbd
# Parent  54c7c9690eaad277635ae59896dbc5292e9dcfb4
patch 8.2.3057: Vim9: debugger test fails with normal features and +terminal

Commit: https://github.com/vim/vim/commit/307dec4567e0f64a7a4cfc2d5302d2aba26db775
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Jun 26 21:21:03 2021 +0200

    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
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3057,
+/**/
     3056,
 /**/
     3055,
diff --git a/src/vim9.h b/src/vim9.h
--- 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