diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-05-08 11:43:07 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-08 11:43:07 +0800 |
| commit | 01f81ed89e58c64827306615a87779bdfea405bc (patch) | |
| tree | b180117c0dd67c93103fc18801412fe43cf2cff0 | |
| parent | ca344b715b0755885fe1b45bd97db4f8bb1e1879 (diff) | |
| parent | 03828536fa14cbbc39e3e3a182ad9b7901da5da7 (diff) | |
| download | rneovim-01f81ed89e58c64827306615a87779bdfea405bc.tar.gz rneovim-01f81ed89e58c64827306615a87779bdfea405bc.tar.bz2 rneovim-01f81ed89e58c64827306615a87779bdfea405bc.zip | |
Merge pull request #23532 from zeertzjq/vim-8.2.4073
vim-patch:8.2.{4073,4075}
| -rw-r--r-- | src/nvim/eval/userfunc.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c index fbb5e8d10c..7e20a298dd 100644 --- a/src/nvim/eval/userfunc.c +++ b/src/nvim/eval/userfunc.c @@ -467,12 +467,10 @@ char *deref_func_name(const char *name, int *lenp, partial_T **const partialp, b /// @param name function name void emsg_funcname(const char *errmsg, const char *name) { - char *p; + char *p = (char *)name; - if ((uint8_t)(*name) == K_SPECIAL) { + if ((uint8_t)name[0] == K_SPECIAL && name[1] != NUL && name[2] != NUL) { p = concat_str("<SNR>", name + 3); - } else { - p = (char *)name; } semsg(_(errmsg), p); @@ -1863,8 +1861,7 @@ char *trans_function_name(char **pp, bool skip, int flags, funcdict_T *fdp, part // Check for hard coded <SNR>: already translated function ID (from a user // command). - if ((unsigned char)(*pp)[0] == K_SPECIAL && (unsigned char)(*pp)[1] == KS_EXTRA - && (*pp)[2] == KE_SNR) { + if ((uint8_t)(*pp)[0] == K_SPECIAL && (uint8_t)(*pp)[1] == KS_EXTRA && (*pp)[2] == KE_SNR) { *pp += 3; len = get_id_len((const char **)pp) + 3; return xmemdupz(start, (size_t)len); @@ -2140,7 +2137,6 @@ void ex_function(exarg_T *eap) char *theline; char *line_to_free = NULL; char c; - int saved_did_emsg; bool saved_wait_return = need_wait_return; char *name = NULL; char *p; @@ -2234,7 +2230,7 @@ void ex_function(exarg_T *eap) // An error in a function call during evaluation of an expression in magic // braces should not cause the function not to be defined. - saved_did_emsg = did_emsg; + const int saved_did_emsg = did_emsg; did_emsg = false; // |