Mercurial > vim
changeset 25796:60e4892dfa45 v8.2.3433
patch 8.2.3433: :delcommand does not take a -buffer option
Commit: https://github.com/vim/vim/commit/bdcba24d8597abd5af509c2fb9206e64e713c711
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Sep 12 20:58:02 2021 +0200
patch 8.2.3433: :delcommand does not take a -buffer option
Problem: :delcommand does not take a -buffer option.
Solution: Add the -buffer option.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 12 Sep 2021 21:00:04 +0200 |
| parents | f0093634cf43 |
| children | fe7da5c48fed |
| files | runtime/doc/map.txt src/errors.h src/testdir/test_usercommands.vim src/usercmd.c src/version.c |
| diffstat | 5 files changed, 47 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -1368,6 +1368,10 @@ See |:verbose-cmd| for more information. :delc[ommand] {cmd} *:delc* *:delcommand* *E184* Delete the user-defined command {cmd}. +:delc[ommand] -buffer {cmd} *E1237* + Delete the user-defined command {cmd} that was defined + for the current buffer. + :comc[lear] *:comc* *:comclear* Delete all user-defined commands.
--- a/src/errors.h +++ b/src/errors.h @@ -141,6 +141,8 @@ EXTERN char e_undefined_variable_str[] EXTERN char e_undefined_variable_char_str[] INIT(= N_("E121: Undefined variable: %c:%s")); #endif +EXTERN char e_no_such_user_defined_command_str[] + INIT(= N_("E184: No such user-defined command: %s")); #ifndef FEAT_DIGRAPHS EXTERN char e_no_digraphs_version[] INIT(= N_("E196: No digraphs in this version")); @@ -656,3 +658,5 @@ EXTERN char e_function_reference_is_not_ INIT(= N_("E1235: Function reference is not set")); EXTERN char e_cannot_use_str_itself_it_is_imported_with_star[] INIT(= N_("E1236: Cannot use %s itself, it is imported with '*'")); +EXTERN char e_no_such_user_defined_command_in_current_buffer_str[] + INIT(= N_("E1237: No such user-defined command in current buffer: %s"));
--- a/src/testdir/test_usercommands.vim +++ b/src/testdir/test_usercommands.vim @@ -656,4 +656,25 @@ func Test_usercmd_with_block() call CheckScriptFailure(lines, 'E1231:') endfunc +func Test_delcommand_buffer() + command Global echo 'global' + command -buffer OneBuffer echo 'one' + new + command -buffer TwoBuffer echo 'two' + call assert_equal(0, exists(':OneBuffer')) + call assert_equal(2, exists(':Global')) + call assert_equal(2, exists(':TwoBuffer')) + delcommand -buffer TwoBuffer + call assert_equal(0, exists(':TwoBuffer')) + call assert_fails('delcommand -buffer Global', 'E1237:') + call assert_fails('delcommand -buffer OneBuffer', 'E1237:') + bwipe! + call assert_equal(2, exists(':OneBuffer')) + delcommand -buffer OneBuffer + call assert_equal(0, exists(':OneBuffer')) + call assert_fails('delcommand -buffer Global', 'E1237:') + delcommand Global + call assert_equal(0, exists(':Global')) +endfunc + " vim: shiftwidth=2 sts=2 expandtab
--- a/src/usercmd.c +++ b/src/usercmd.c @@ -1162,8 +1162,16 @@ ex_delcommand(exarg_T *eap) { int i = 0; ucmd_T *cmd = NULL; - int cmp = -1; + int res = -1; garray_T *gap; + char_u *arg = eap->arg; + int buffer_only = FALSE; + + if (STRNCMP(arg, "-buffer", 7) == 0 && VIM_ISWHITE(arg[7])) + { + buffer_only = TRUE; + arg = skipwhite(arg + 7); + } gap = &curbuf->b_ucmds; for (;;) @@ -1171,18 +1179,20 @@ ex_delcommand(exarg_T *eap) for (i = 0; i < gap->ga_len; ++i) { cmd = USER_CMD_GA(gap, i); - cmp = STRCMP(eap->arg, cmd->uc_name); - if (cmp <= 0) + res = STRCMP(arg, cmd->uc_name); + if (res <= 0) break; } - if (gap == &ucmds || cmp == 0) + if (gap == &ucmds || res == 0 || buffer_only) break; gap = &ucmds; } - if (cmp != 0) + if (res != 0) { - semsg(_("E184: No such user-defined command: %s"), eap->arg); + semsg(_(buffer_only + ? e_no_such_user_defined_command_in_current_buffer_str + : e_no_such_user_defined_command_str), arg); return; }