diff options
| -rw-r--r-- | src/nvim/os/env.c | 19 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 19 insertions, 2 deletions
diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c index c1804067e9..ea0e992fe2 100644 --- a/src/nvim/os/env.c +++ b/src/nvim/os/env.c @@ -262,8 +262,25 @@ void expand_env_esc(char_u *srcp, char_u *dst, int dstlen, bool esc, bool one, startstr_len = (int)STRLEN(startstr); src = skipwhite(srcp); - --dstlen; // leave one char space for "\," + dstlen--; // leave one char space for "\," while (*src && dstlen > 0) { + // Skip over `=expr`. + if (src[0] == '`' && src[1] == '=') { + var = src; + src += 2; + (void)skip_expr(&src); + if (*src == '`') { + src++; + } + size_t len = (size_t)(src - var); + if (len > (size_t)dstlen) { + len = (size_t)dstlen; + } + memcpy((char *)dst, (char *)var, len); + dst += len; + dstlen -= len; + continue; + } copy_char = true; if ((*src == '$') || (*src == '~' && at_start)) { mustfree = false; diff --git a/src/nvim/version.c b/src/nvim/version.c index 6fdad105e4..7f400773b0 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -458,7 +458,7 @@ static int included_patches[] = { 835, 834, 833, - // 832, + 832, 831, 830, // 829 NA |