diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-11-20 18:59:19 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-11-20 18:59:19 +0100 |
| commit | bebaa0d5c034eb2c4c4dcac86ae6a859b24d2693 (patch) | |
| tree | e4606a4fe59e5328c093883cfc1cc0287e8101e9 | |
| parent | 80d868ec25094615f2531a1e01ed1e729366c3bc (diff) | |
| download | vim-git-bebaa0d5c034eb2c4c4dcac86ae6a859b24d2693.tar.gz | |
patch 8.2.2020: some compilers do not like the "namespace" argumentv8.2.2020
Problem: Some compilers do not like the "namespace" argument.
Solution: Rename to "use_namespace". (closes #7332)
| -rw-r--r-- | src/proto/vim9compile.pro | 2 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9compile.c | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/proto/vim9compile.pro b/src/proto/vim9compile.pro index 9ed86da9a..a19088bc6 100644 --- a/src/proto/vim9compile.pro +++ b/src/proto/vim9compile.pro @@ -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); diff --git a/src/version.c b/src/version.c index 70ebd9c18..4fdc0f1c8 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2020, +/**/ 2019, /**/ 2018, diff --git a/src/vim9compile.c b/src/vim9compile.c index 3057fb1a6..7102d488f 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -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; |