From 6ce1b59228b94f4a5b076af75b091e14483c1392 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 14 Jun 2022 16:06:07 +0100 Subject: [PATCH] patch 8.2.5093: error message for unknown command may have the command twice Problem: Error message for unknown command may mention the command twice. (Malcolm Rowe) Solution: Add the did_append_cmd flag. (closes #10570) --- src/ex_docmd.c | 4 +++- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 23867d8ac9..fed9330b52 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -1744,6 +1744,7 @@ do_one_cmd( int did_set_expr_line = FALSE; #endif int sourcing = flags & DOCMD_VERBOSE; + int did_append_cmd = FALSE; CLEAR_FIELD(ea); ea.line1 = 1; @@ -2019,6 +2020,7 @@ do_one_cmd( append_command(after_modifier); else append_command(*cmdlinep); + did_append_cmd = TRUE; } errormsg = (char *)IObuff; did_emsg_syntax = TRUE; @@ -2609,7 +2611,7 @@ doend: if (errormsg != NULL && *errormsg != NUL && !did_emsg) { - if (sourcing || !KeyTyped) + if ((sourcing || !KeyTyped) && !did_append_cmd) { if (errormsg != (char *)IObuff) { diff --git a/src/version.c b/src/version.c index f21efe1577..50c6ed3b0b 100644 --- a/src/version.c +++ b/src/version.c @@ -734,6 +734,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 5093, /**/ 5092, /**/ -- 2.47.2