forked from aniani/vim
patch 8.2.2020: some compilers do not like the "namespace" argument
Problem: Some compilers do not like the "namespace" argument. Solution: Rename to "use_namespace". (closes #7332)
This commit is contained in:
@@ -8,7 +8,7 @@ imported_T *find_imported_in_script(char_u *name, size_t len, int sid);
|
||||
int vim9_comment_start(char_u *p);
|
||||
char_u *peek_next_line_from_context(cctx_T *cctx);
|
||||
char_u *next_line_from_context(cctx_T *cctx, int skip_comment);
|
||||
char_u *to_name_end(char_u *arg, int namespace);
|
||||
char_u *to_name_end(char_u *arg, int use_namespace);
|
||||
char_u *to_name_const_end(char_u *arg);
|
||||
exptype_T get_compare_type(char_u *p, int *len, int *type_is);
|
||||
void error_white_both(char_u *op, int len);
|
||||
|
@@ -750,6 +750,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
2020,
|
||||
/**/
|
||||
2019,
|
||||
/**/
|
||||
|
@@ -2767,12 +2767,12 @@ theend:
|
||||
/*
|
||||
* Find the end of a variable or function name. Unlike find_name_end() this
|
||||
* does not recognize magic braces.
|
||||
* When "namespace" is TRUE recognize "b:", "s:", etc.
|
||||
* When "use_namespace" is TRUE recognize "b:", "s:", etc.
|
||||
* Return a pointer to just after the name. Equal to "arg" if there is no
|
||||
* valid name.
|
||||
*/
|
||||
char_u *
|
||||
to_name_end(char_u *arg, int namespace)
|
||||
to_name_end(char_u *arg, int use_namespace)
|
||||
{
|
||||
char_u *p;
|
||||
|
||||
@@ -2784,7 +2784,7 @@ to_name_end(char_u *arg, int namespace)
|
||||
// Include a namespace such as "s:var" and "v:var". But "n:" is not
|
||||
// and can be used in slice "[n:]".
|
||||
if (*p == ':' && (p != arg + 1
|
||||
|| !namespace
|
||||
|| !use_namespace
|
||||
|| vim_strchr(VIM9_NAMESPACE_CHAR, *arg) == NULL))
|
||||
break;
|
||||
return p;
|
||||
|
Reference in New Issue
Block a user