aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/option.c
diff options
context:
space:
mode:
authorckelsel <ckelsel@hotmail.com>2017-09-27 19:34:19 +0800
committerckelsel <ckelsel@hotmail.com>2017-09-27 19:34:19 +0800
commitc3de878ab1c3d1001660c3b3d6ce39fbc4fcd03c (patch)
treecf606878176f67bb5dcbf480d47d7ea9e0f4d1bf /src/nvim/option.c
parent90fc9039ddcadc61d4236bdd2d638d690081e04d (diff)
parent542ed5f5d31647bfec6d3119f4e2993544530c35 (diff)
downloadrneovim-c3de878ab1c3d1001660c3b3d6ce39fbc4fcd03c.tar.gz
rneovim-c3de878ab1c3d1001660c3b3d6ce39fbc4fcd03c.tar.bz2
rneovim-c3de878ab1c3d1001660c3b3d6ce39fbc4fcd03c.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/nvim/option.c')
-rw-r--r--src/nvim/option.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 74250e83e6..13aadb71bb 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -2997,9 +2997,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) {