From 53cbfd02209caee54190aae7f1ff8b407ae4039b Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Fri, 9 Apr 2021 21:46:02 -0400 Subject: vim-patch:8.2.0044: expression type is used inconsistently Problem: Expression type is used inconsistently. Solution: Add "ETYPE_IS" and "ETYPE_ISNOT" as separate enum values. Rename "TYPE_" to "ETYPE_" to avoid confusion. https://github.com/vim/vim/commit/07a3db89b8953bd0964895badb3b662f7514bc10 --- src/nvim/ex_cmds2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/ex_cmds2.c') diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index e394edb032..a58bd2003c 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -876,7 +876,7 @@ debuggy_find( debug_newval = typval_tostring(bp->dbg_val); line = true; } else { - if (typval_compare(tv, bp->dbg_val, TYPE_EQUAL, true, false) == OK + if (typval_compare(tv, bp->dbg_val, ETYPE_IS, false) == OK && tv->vval.v_number == false) { line = true; debug_oldval = typval_tostring(bp->dbg_val); -- cgit From ca214311d23e687b9607ba97d01c9ae361d3743a Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Wed, 7 Apr 2021 21:57:40 -0400 Subject: vim-patch:8.2.0069: ETYPE_ is used for two different enums Problem: ETYPE_ is used for two different enums. Solution: Rename one to use EXPR_. https://github.com/vim/vim/commit/87396072c5c468f0c129e4ec7cd944ac897b7752 --- src/nvim/ex_cmds2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/ex_cmds2.c') diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index a58bd2003c..950a1a436f 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -876,7 +876,7 @@ debuggy_find( debug_newval = typval_tostring(bp->dbg_val); line = true; } else { - if (typval_compare(tv, bp->dbg_val, ETYPE_IS, false) == OK + if (typval_compare(tv, bp->dbg_val, EXPR_IS, false) == OK && tv->vval.v_number == false) { line = true; debug_oldval = typval_tostring(bp->dbg_val); -- cgit