Mercurial > vim
changeset 27778:858002fef4b7 v8.2.4415
patch 8.2.4415: function argument name conflicts with C++ keyword
Commit: https://github.com/vim/vim/commit/b8fb5bb68d45f3e52bb9ea201dc9e7dc6b6d2c6d
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Feb 18 13:56:38 2022 +0000
patch 8.2.4415: function argument name conflicts with C++ keyword
Problem: Function argument name conflicts with C++ keyword.
Solution: Rename the argument.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 18 Feb 2022 15:00:06 +0100 |
| parents | 95c4f1b1421b |
| children | dd9f44ebf32d |
| files | src/proto/usercmd.pro src/usercmd.c src/version.c |
| diffstat | 3 files changed, 10 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/proto/usercmd.pro +++ b/src/proto/usercmd.pro @@ -1,6 +1,6 @@ /* usercmd.c */ char_u *find_ucmd(exarg_T *eap, char_u *p, int *full, expand_T *xp, int *complp); -char_u *set_context_in_user_cmdarg(char_u *cmd, char_u *arg, long argt, int compl, expand_T *xp, int forceit); +char_u *set_context_in_user_cmdarg(char_u *cmd, char_u *arg, long argt, int context, expand_T *xp, int forceit); char_u *set_context_in_user_cmd(expand_T *xp, char_u *arg_in); char_u *expand_user_command_name(int idx); char_u *get_user_commands(expand_T *xp, int idx);
--- a/src/usercmd.c +++ b/src/usercmd.c @@ -303,29 +303,29 @@ set_context_in_user_cmdarg( char_u *cmd UNUSED, char_u *arg, long argt, - int compl, + int context, expand_T *xp, int forceit) { char_u *p; - if (compl == EXPAND_NOTHING) + if (context == EXPAND_NOTHING) return NULL; if (argt & EX_XFILE) { // EX_XFILE: file names are handled before this call - xp->xp_context = compl; + xp->xp_context = context; return NULL; } #ifdef FEAT_MENU - if (compl == EXPAND_MENUS) + if (context == EXPAND_MENUS) return set_context_in_menu_cmd(xp, cmd, arg, forceit); #endif - if (compl == EXPAND_COMMANDS) + if (context == EXPAND_COMMANDS) return arg; - if (compl == EXPAND_MAPPINGS) + if (context == EXPAND_MAPPINGS) return set_context_in_map_cmd(xp, (char_u *)"map", arg, forceit, FALSE, FALSE, CMD_map); // Find start of last argument. @@ -340,7 +340,7 @@ set_context_in_user_cmdarg( MB_PTR_ADV(p); } xp->xp_pattern = arg; - xp->xp_context = compl; + xp->xp_context = context; return NULL; }