diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-09-27 19:21:40 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-09-27 19:21:40 +0800 |
| commit | dde62900c8cfed967bd54218c8eb0790954f8c14 (patch) | |
| tree | c3bc82d0edcc3582578922bd0d13233ab751b576 /src/nvim/option.c | |
| parent | 3a1c33a6c3ad5074bfc442507282a438726f1b58 (diff) | |
| parent | 542ed5f5d31647bfec6d3119f4e2993544530c35 (diff) | |
| download | rneovim-dde62900c8cfed967bd54218c8eb0790954f8c14.tar.gz rneovim-dde62900c8cfed967bd54218c8eb0790954f8c14.tar.bz2 rneovim-dde62900c8cfed967bd54218c8eb0790954f8c14.zip | |
Merge branch 'master' of https://github.com/neovim/neovim into vim-8.0.0101
fix Conflicts
Diffstat (limited to 'src/nvim/option.c')
| -rw-r--r-- | src/nvim/option.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index e989f700ae..464a8ca608 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -3001,9 +3001,10 @@ did_set_string_option ( if (s[-1] == 'k' || s[-1] == 's') { /* skip optional filename after 'k' and 's' */ while (*s && *s != ',' && *s != ' ') { - if (*s == '\\') - ++s; - ++s; + if (*s == '\\' && s[1] != NUL) { + s++; + } + s++; } } else { if (errbuf != NULL) { |