thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.3414: fullcommand() gives wrong name with buffer-local user command

Browse Source 
Problem:    fullcommand() gives the wrong name if there is a buffer-local user
            command. (Naohiro Ono)
Solution:   Use a separate function to get the user command name.
            (closes #8840)
This commit is contained in:
Bram Moolenaar
2021-09-08 14:29:46 +02:00
parent a9e3d56087
commit 80c88eac5a
5 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/usercmd.c
View File

@@ -289,7 +289,7 @@ set_context_in_user_cmd(expand_T *xp, char_u *arg_in)
}
char_u *
get_user_command_name(int idx)
expand_user_command_name(int idx)
{
return get_user_commands(NULL, idx - (int)CMD_SIZE);
}
@@ -315,6 +315,32 @@ get_user_commands(expand_T *xp UNUSED, int idx)
return NULL;
}
/*
* Get the name of user command "idx". "cmdidx" can be CMD_USER or
* CMD_USER_BUF.
* Returns NULL if the command is not found.
*/
char_u *
get_user_command_name(int idx, int cmdidx)
{
if (cmdidx == CMD_USER && idx < ucmds.ga_len)
return USER_CMD(idx)->uc_name;
if (cmdidx == CMD_USER_BUF)
{
// In cmdwin, the alternative buffer should be used.
buf_T *buf =
#ifdef FEAT_CMDWIN
(cmdwin_type != 0 && get_cmdline_type() == NUL)
? prevwin->w_buffer :
#endif
curbuf;
if (idx < buf->b_ucmds.ga_len)
return USER_CMD_GA(&buf->b_ucmds, idx)->uc_name;
}
return NULL;
}
/*
* Function given to ExpandGeneric() to obtain the list of user address type
* names.