aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00
Code Activity

patch 8.2.3433: :delcommand does not take a -buffer option

Browse Source 
Problem:    :delcommand does not take a -buffer option.
Solution:   Add the -buffer option.
This commit is contained in:
Bram Moolenaar
2021-09-12 20:58:02 +02:00
parent ca0627df69
commit bdcba24d85
5 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/doc/map.txt
View File

@@ -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.

4
src/errors.h
View File

@@ -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_set[]
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"));

21
src/testdir/test_usercommands.vim
View File

@@ -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

22
src/usercmd.c
View File

@@ -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;
}

2
src/version.c
View File

@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
3433,
/**/
3432,
/**/