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

patch 8.2.4415: function argument name conflicts with C++ keyword

Browse Source 
Problem:    Function argument name conflicts with C++ keyword.
Solution:   Rename the argument.
This commit is contained in:
Bram Moolenaar 2022-02-18 13:56:38 +00:00
parent 97b231541d
commit b8fb5bb68d
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/proto/usercmd.pro
View File

@ -1,6 +1,6 @@
/* usercmd.c */ /* usercmd.c */
char_u *find_ucmd(exarg_T *eap, char_u *p, int *full, expand_T *xp, int *complp); 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 *set_context_in_user_cmd(expand_T *xp, char_u *arg_in);
char_u *expand_user_command_name(int idx); char_u *expand_user_command_name(int idx);
char_u *get_user_commands(expand_T *xp, int idx); char_u *get_user_commands(expand_T *xp, int idx);

14
src/usercmd.c
View File

@ -303,29 +303,29 @@ set_context_in_user_cmdarg(
char_u *cmd UNUSED, char_u *cmd UNUSED,
char_u *arg, char_u *arg,
long argt, long argt,
int compl, int context,
expand_T *xp, expand_T *xp,
int forceit) int forceit)
{ {
char_u *p; char_u *p;
if (compl == EXPAND_NOTHING) if (context == EXPAND_NOTHING)
return NULL; return NULL;
if (argt & EX_XFILE) if (argt & EX_XFILE)
{ {
// EX_XFILE: file names are handled before this call // EX_XFILE: file names are handled before this call
xp->xp_context = compl; xp->xp_context = context;
return NULL; return NULL;
} }
#ifdef FEAT_MENU #ifdef FEAT_MENU
if (compl == EXPAND_MENUS) if (context == EXPAND_MENUS)
return set_context_in_menu_cmd(xp, cmd, arg, forceit); return set_context_in_menu_cmd(xp, cmd, arg, forceit);
#endif #endif
if (compl == EXPAND_COMMANDS) if (context == EXPAND_COMMANDS)
return arg; return arg;
if (compl == EXPAND_MAPPINGS) if (context == EXPAND_MAPPINGS)
return set_context_in_map_cmd(xp, (char_u *)"map", arg, forceit, FALSE, return set_context_in_map_cmd(xp, (char_u *)"map", arg, forceit, FALSE,
FALSE, CMD_map); FALSE, CMD_map);
// Find start of last argument. // Find start of last argument.
@ -340,7 +340,7 @@ set_context_in_user_cmdarg(
MB_PTR_ADV(p); MB_PTR_ADV(p);
} }
xp->xp_pattern = arg; xp->xp_pattern = arg;
xp->xp_context = compl; xp->xp_context = context;
return NULL; return NULL;
} }

2
src/version.c
View File

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