Patch 8.2.4415

[Bram Moolenaar]

Patch 8.2.4415
Problem: Function argument name conflicts with C++ keyword.
Solution: Rename the argument.
Files: src/usercmd.c, src/proto/usercmd.pro


*** ../vim-8.2.4414/src/usercmd.c 2022-02-16 12:44:26.129908861 +0000
--- src/usercmd.c 2022-02-18 13:55:44.914231893 +0000
***************
*** 303,331 ****
char_u *cmd UNUSED,
char_u *arg,
long argt,
! int compl,
expand_T *xp,
int forceit)
{
char_u *p;

! if (compl == EXPAND_NOTHING)
return NULL;

if (argt & EX_XFILE)
{
// EX_XFILE: file names are handled before this call
! xp->xp_context = compl;
return NULL;
}

#ifdef FEAT_MENU
! if (compl == EXPAND_MENUS)
return set_context_in_menu_cmd(xp, cmd, arg, forceit);
#endif
! if (compl == EXPAND_COMMANDS)
return arg;
! if (compl == EXPAND_MAPPINGS)
return set_context_in_map_cmd(xp, (char_u *)"map", arg, forceit, FALSE,
FALSE, CMD_map);
// Find start of last argument.
--- 303,331 ----
char_u *cmd UNUSED,
char_u *arg,
long argt,
! int context,
expand_T *xp,
int forceit)
{
char_u *p;

! if (context == EXPAND_NOTHING)
return NULL;

if (argt & EX_XFILE)
{
// EX_XFILE: file names are handled before this call
! xp->xp_context = context;
return NULL;
}

#ifdef FEAT_MENU
! if (context == EXPAND_MENUS)
return set_context_in_menu_cmd(xp, cmd, arg, forceit);
#endif
! if (context == EXPAND_COMMANDS)
return arg;
! 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,346 ****
MB_PTR_ADV(p);
}
xp->xp_pattern = arg;
! xp->xp_context = compl;

return NULL;
}
--- 340,346 ----
MB_PTR_ADV(p);
}
xp->xp_pattern = arg;
! xp->xp_context = context;

return NULL;
}
*** ../vim-8.2.4414/src/proto/usercmd.pro 2022-02-16 12:44:26.129908861 +0000
--- src/proto/usercmd.pro 2022-02-18 13:55:38.474246570 +0000
***************
*** 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_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);
--- 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 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);
*** ../vim-8.2.4414/src/version.c 2022-02-18 13:45:51.719569986 +0000
--- src/version.c 2022-02-18 13:54:22.898418731 +0000
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 4415,
/**/

--
hundred-and-one symptoms of being an internet addict:
69. Yahoo welcomes you with your own start page

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///