Mercurial > vim
diff src/usercmd.c @ 25757:589226a5f317 v8.2.3414
patch 8.2.3414: fullcommand() gives wrong name with buffer-local user command
Commit: https://github.com/vim/vim/commit/80c88eac5a81dd9f1a96fc80cb8aab6c84fe7b86
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Sep 8 14:29:46 2021 +0200
patch 8.2.3414: fullcommand() gives wrong name with buffer-local user command
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 08 Sep 2021 14:30:05 +0200 |
| parents | b9419c9d3da6 |
| children | 60e4892dfa45 |
line wrap: on
line diff
--- a/src/usercmd.c +++ b/src/usercmd.c @@ -289,7 +289,7 @@ set_context_in_user_cmd(expand_T *xp, ch } char_u * -get_user_command_name(int idx) +expand_user_command_name(int idx) { return get_user_commands(NULL, idx - (int)CMD_SIZE); } @@ -316,6 +316,32 @@ get_user_commands(expand_T *xp UNUSED, i } /* + * 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. */