summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-03-10 13:29:20 +0000
committerBram Moolenaar <Bram@vim.org>2022-03-10 13:29:20 +0000
commitcf6662082f89de3458c69c4390055ab99aa7dd22 (patch)
treeface9890f3bb4225718bf868fd4d209bd5b689f7
parent81da16b53fbf804a3cd32bc15313c96444b71484 (diff)
downloadvim-git-cf6662082f89de3458c69c4390055ab99aa7dd22.tar.gz
patch 8.2.4536: debugger test fails when breaking on expressionv8.2.4536
Problem: Debugger test fails when breaking on expression. Solution: Compare strings with "==" instead of "is".
-rw-r--r--src/debugger.c7
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/debugger.c b/src/debugger.c
index 54bf6ba87..6c38e5a3d 100644
--- a/src/debugger.c
+++ b/src/debugger.c
@@ -989,7 +989,12 @@ debuggy_find(
}
else
{
- if (typval_compare(tv, bp->dbg_val, EXPR_IS, FALSE) == OK
+ // Use "==" instead of "is" for strings, that is what we
+ // always have done.
+ exprtype_T type = tv->v_type == VAR_STRING
+ ? EXPR_EQUAL : EXPR_IS;
+
+ if (typval_compare(tv, bp->dbg_val, type, FALSE) == OK
&& tv->vval.v_number == FALSE)
{
typval_T *v;
diff --git a/src/version.c b/src/version.c
index 49810ea00..7856aedc8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4536,
+/**/
4535,
/**/
4534,