diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-06-14 16:06:07 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-06-14 16:06:07 +0100 |
| commit | 6ce1b59228b94f4a5b076af75b091e14483c1392 (patch) | |
| tree | 43757b172327bf80229d55dfed2732a20d110caf | |
| parent | 48ce135e6d45e6c10ed0c0fc4cb8433bf647672a (diff) | |
| download | vim-git-6ce1b59228b94f4a5b076af75b091e14483c1392.tar.gz | |
patch 8.2.5093: error message for unknown command may have the command twicev8.2.5093
Problem: Error message for unknown command may mention the command twice.
(Malcolm Rowe)
Solution: Add the did_append_cmd flag. (closes #10570)
| -rw-r--r-- | src/ex_docmd.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 23867d8ac..fed9330b5 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 f21efe157..50c6ed3b0 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 5093, +/**/ 5092, /**/ 5091, |