diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/option.c | 3 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 38ce155b24..c11e22703e 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -1676,7 +1676,8 @@ do_set ( if (adding) { i = (int)STRLEN(origval); // Strip a trailing comma, would get 2. - if (comma && (flags & P_ONECOMMA) && i > 1 + if (comma && i > 1 + && (flags & P_ONECOMMA) == P_ONECOMMA && origval[i - 1] == ',' && origval[i - 2] != '\\') { i--; diff --git a/src/nvim/version.c b/src/nvim/version.c index cd77a86626..0b5783b41c 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -373,7 +373,7 @@ static int included_patches[] = { // 918 NA // 917 NA 916, - // 915, + 915, // 914, // 913 NA // 912, |