diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-12-08 16:03:28 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-12-08 16:03:28 +0100 |
| commit | 55d46913084745a48749d7ac4f48930852e1d87e (patch) | |
| tree | 8df234862f6e7f6c3f33e25d705aaed2626fcf58 /src/ex_docmd.c | |
| parent | 76ab4fd61901090e6af3451ca6c5ca0fc370571f (diff) | |
patch 8.1.0573: cannot redefine user command without ! in same scriptv8.1.0573
Problem: Cannot redefine user command without ! in same script
Solution: Allow redefining user command without ! in same script, like with
functions.
Diffstat (limited to 'src/ex_docmd.c')
| -rw-r--r-- | src/ex_docmd.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 9040c0d073..99a06fc342 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -5869,9 +5869,13 @@ uc_add_command( if (cmp == 0) { - if (!force) + // Command can be replaced with "command!" and when sourcing the + // same script again, but only once. + if (!force && (cmd->uc_script_ctx.sc_sid != current_sctx.sc_sid + || cmd->uc_script_ctx.sc_seq == current_sctx.sc_seq)) { - EMSG(_("E174: Command already exists: add ! to replace it")); + EMSG2(_("E174: Command already exists: add ! to replace it: %s"), + name); goto fail; } |