summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-06-26 21:21:03 +0200
committerBram Moolenaar <Bram@vim.org>2021-06-26 21:21:03 +0200
commit307dec4567e0f64a7a4cfc2d5302d2aba26db775 (patch)
tree85dfb066a1ebb0f48cf33bb35628461edd3e78a7
parent14ded11fcad77ebf41032ec80a95d516ca9acb1c (diff)
patch 8.2.3057: Vim9: debugger test fails with normal features and +terminalv8.2.3057
Problem: Vim9: debugger test fails with normal features and +terminal. (Dominique Pellé) Solution: Adjust the INSTRUCTIONS macro. (closes #8460)
-rw-r--r--src/version.c2
-rw-r--r--src/vim9.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c
index 085801849b..6069a397b1 100644
--- 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
index 97b9a3ea87..b48a2f7c94 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