diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-08-22 12:02:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-22 12:02:45 +0800 |
| commit | 4f6d0d6da971ee837864bf96aa28cc24c2d58b5a (patch) | |
| tree | a835274cccbea2e69a7458a630770129d790b5e1 /src/nvim/eval.c | |
| parent | d5cc161deac2371a39821c94fd2de4f1c41b6eb9 (diff) | |
| download | rneovim-4f6d0d6da971ee837864bf96aa28cc24c2d58b5a.tar.gz rneovim-4f6d0d6da971ee837864bf96aa28cc24c2d58b5a.tar.bz2 rneovim-4f6d0d6da971ee837864bf96aa28cc24c2d58b5a.zip | |
vim-patch:8.2.2289: Vim9: 'cpo' can become empty (#19887)
Problem: Vim9: 'cpo' can become empty.
Solution: Use empty_option instead of an empty string. Update quickfix
buffer after restoring 'cpo'. (closes vim/vim#7608)
https://github.com/vim/vim/commit/e5a2dc87fd9d63dfd0d9c379e363ee8b8c05b14c
Omit test as it is Vim9 script.
Diffstat (limited to 'src/nvim/eval.c')
| -rw-r--r-- | src/nvim/eval.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index cb46e26f82..a80d2e5fbb 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -2192,7 +2192,7 @@ int pattern_match(char *pat, char *text, bool ic) // avoid 'l' flag in 'cpoptions' char *save_cpo = p_cpo; - p_cpo = ""; + p_cpo = (char *)empty_option; regmatch.regprog = vim_regcomp(pat, RE_MAGIC + RE_STRING); if (regmatch.regprog != NULL) { regmatch.rm_ic = ic; @@ -8389,6 +8389,11 @@ char *do_string_sub(char *str, char *pat, char *sub, typval_T *expr, char *flags p_cpo = save_cpo; } else { // Darn, evaluating {sub} expression or {expr} changed the value. + // If it's still empty it was changed and restored, need to restore in + // the complicated way. + if (*p_cpo == NUL) { + set_option_value("cpo", 0L, save_cpo, 0); + } free_string_option((char_u *)save_cpo); } |