Mercurial > vim

diff 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
line wrap: on
line diff
--- a/src/usercmd.c
+++ b/src/usercmd.c
@@ -131,7 +131,7 @@ find_ucmd(
     char_u	*p,	// end of the command (possibly including count)
     int		*full,	// set to TRUE for a full match
     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		j, k, matchlen = 0;
@@ -188,8 +188,8 @@ find_ucmd(
 		    eap->addr_type = uc->uc_addr_type;
 
 # ifdef FEAT_CMDL_COMPL
-		    if (compl != NULL)
-			*compl = uc->uc_compl;
+		    if (complp != NULL)
+			*complp = uc->uc_compl;
 #  ifdef FEAT_EVAL
 		    if (xp != NULL)
 		    {
@@ -692,7 +692,7 @@ uc_scan_attr(
     long	*argt,
     long	*def,
     int		*flags,
-    int		*compl,
+    int		*complp,
     char_u	**compl_arg,
     int		*addr_type_arg)
 {
@@ -810,7 +810,7 @@ invalid_count:
 		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)
 		return FAIL;
 	}