aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-01 04:54:07 -04:00
Code Activity

patch 8.1.1237: error for using "compl", reserved word in C++

Browse Source 
Problem:    Error for using "compl", reserved word in C++.
Solution:   Rename to "complp". (suggestion by Ken Takata)
This commit is contained in:
Bram Moolenaar
2019-04-29 21:30:45 +02:00
parent fe368edcc0
commit 52111f8231
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/proto/usercmd.pro
View File

@@ -1,5 +1,5 @@
/* usercmd.c */ /* usercmd.c */
char_u *find_ucmd(exarg_T *eap, char_u *p, int *full, expand_T *xp, int *compl); char_u *find_ucmd(exarg_T *eap, char_u *p, int *full, expand_T *xp, int *complp);
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 *get_user_command_name(int idx); char_u *get_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);
@@ -7,12 +7,12 @@ char_u *get_user_cmd_addr_type(expand_T *xp, int idx);
char_u *get_user_cmd_flags(expand_T *xp, int idx); char_u *get_user_cmd_flags(expand_T *xp, int idx);
char_u *get_user_cmd_nargs(expand_T *xp, int idx); char_u *get_user_cmd_nargs(expand_T *xp, int idx);
char_u *get_user_cmd_complete(expand_T *xp, int idx); char_u *get_user_cmd_complete(expand_T *xp, int idx);
int cmdcomplete_str_to_type(char_u *complete_str);
char *uc_fun_cmd(void); char *uc_fun_cmd(void);
int parse_compl_arg(char_u *value, int vallen, int *complp, long *argt, char_u **compl_arg);
void ex_command(exarg_T *eap); void ex_command(exarg_T *eap);
void ex_comclear(exarg_T *eap); void ex_comclear(exarg_T *eap);
void uc_clear(garray_T *gap); void uc_clear(garray_T *gap);
void ex_delcommand(exarg_T *eap); void ex_delcommand(exarg_T *eap);
void do_ucmd(exarg_T *eap); void do_ucmd(exarg_T *eap);
int parse_compl_arg(char_u *value, int vallen, int *complp, long *argt, char_u **compl_arg);
int cmdcomplete_str_to_type(char_u *complete_str);
/* vim: set ft=c : */ /* vim: set ft=c : */

10
src/usercmd.c
View File

@@ -131,7 +131,7 @@ find_ucmd(
char_u *p, // end of the command (possibly including count) char_u *p, // end of the command (possibly including count)
int *full, // set to TRUE for a full match int *full, // set to TRUE for a full match
expand_T *xp, // used for completion, NULL otherwise expand_T *xp, // used for completion, NULL otherwise
int *compl UNUSED) // completion flags or NULL int *complp UNUSED) // completion flags or NULL
{ {
int len = (int)(p - eap->cmd); int len = (int)(p - eap->cmd);
int j, k, matchlen = 0; int j, k, matchlen = 0;
@@ -188,8 +188,8 @@ find_ucmd(
eap->addr_type = uc->uc_addr_type; eap->addr_type = uc->uc_addr_type;
# ifdef FEAT_CMDL_COMPL # ifdef FEAT_CMDL_COMPL
if (compl != NULL) if (complp != NULL)
*compl = uc->uc_compl; *complp = uc->uc_compl;
# ifdef FEAT_EVAL # ifdef FEAT_EVAL
if (xp != NULL) if (xp != NULL)
{ {
@@ -692,7 +692,7 @@ uc_scan_attr(
long *argt, long *argt,
long *def, long *def,
int *flags, int *flags,
int *compl, int *complp,
char_u **compl_arg, char_u **compl_arg,
int *addr_type_arg) int *addr_type_arg)
{ {
@@ -810,7 +810,7 @@ invalid_count:
return FAIL; return FAIL;
} }
if (parse_compl_arg(val, (int)vallen, compl, argt, compl_arg) if (parse_compl_arg(val, (int)vallen, complp, argt, compl_arg)
== FAIL) == FAIL)
return FAIL; return FAIL;
} }

2
src/version.c
View File

@@ -767,6 +767,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 */
/**/
1237,
/**/ /**/
1236, 1236,
/**/ /**/