Mercurial > vim

comparison src/usercmd.c @ 16466:a2befc9b3729 v8.1.1237

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1237: error for using "compl", reserved word in C++ commit https://github.com/vim/vim/commit/52111f82318dfbeb6a0b06230c0609abff509250 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Apr 29 21:30:45 2019 +0200 patch 8.1.1237: error for using "compl", reserved word in C++ Problem: Error for using "compl", reserved word in C++. Solution: Rename to "complp". (suggestion by Ken Takata)
author Bram Moolenaar <Bram@vim.org>
date Mon, 29 Apr 2019 21:45:05 +0200
parents 5b5c5daf57de
children 854fb0ad4be6
comparison
equal deleted inserted replaced
16465:07b8f33da370 16466:a2befc9b3729
129 find_ucmd( 129 find_ucmd(
130 exarg_T *eap, 130 exarg_T *eap,
131 char_u *p, // end of the command (possibly including count) 131 char_u *p, // end of the command (possibly including count)
132 int *full, // set to TRUE for a full match 132 int *full, // set to TRUE for a full match
133 expand_T *xp, // used for completion, NULL otherwise 133 expand_T *xp, // used for completion, NULL otherwise
134 int *compl UNUSED) // completion flags or NULL 134 int *complp UNUSED) // completion flags or NULL
135 { 135 {
136 int len = (int)(p - eap->cmd); 136 int len = (int)(p - eap->cmd);
137 int j, k, matchlen = 0; 137 int j, k, matchlen = 0;
138 ucmd_T *uc; 138 ucmd_T *uc;
139 int found = FALSE; 139 int found = FALSE;
186 eap->argt = (long)uc->uc_argt; 186 eap->argt = (long)uc->uc_argt;
187 eap->useridx = j; 187 eap->useridx = j;
188 eap->addr_type = uc->uc_addr_type; 188 eap->addr_type = uc->uc_addr_type;
189 189
190 # ifdef FEAT_CMDL_COMPL 190 # ifdef FEAT_CMDL_COMPL
191 if (compl != NULL) 191 if (complp != NULL)
192 *compl = uc->uc_compl; 192 *complp = uc->uc_compl;
193 # ifdef FEAT_EVAL 193 # ifdef FEAT_EVAL
194 if (xp != NULL) 194 if (xp != NULL)
195 { 195 {
196 xp->xp_arg = uc->uc_compl_arg; 196 xp->xp_arg = uc->uc_compl_arg;
197 xp->xp_script_ctx = uc->uc_script_ctx; 197 xp->xp_script_ctx = uc->uc_script_ctx;
690 char_u *attr, 690 char_u *attr,
691 size_t len, 691 size_t len,
692 long *argt, 692 long *argt,
693 long *def, 693 long *def,
694 int *flags, 694 int *flags,
695 int *compl, 695 int *complp,
696 char_u **compl_arg, 696 char_u **compl_arg,
697 int *addr_type_arg) 697 int *addr_type_arg)
698 { 698 {
699 char_u *p; 699 char_u *p;
700 700
808 { 808 {
809 emsg(_("E179: argument required for -complete")); 809 emsg(_("E179: argument required for -complete"));
810 return FAIL; 810 return FAIL;
811 } 811 }
812 812
813 if (parse_compl_arg(val, (int)vallen, compl, argt, compl_arg) 813 if (parse_compl_arg(val, (int)vallen, complp, argt, compl_arg)
814 == FAIL) 814 == FAIL)
815 return FAIL; 815 return FAIL;
816 } 816 }
817 else if (STRNICMP(attr, "addr", attrlen) == 0) 817 else if (STRNICMP(attr, "addr", attrlen) == 0)
818 { 818 {