From 69e5427be170d98a413edb1e191254f84d8642f6 Mon Sep 17 00:00:00 2001
From: watiko <service@mail.watiko.net>
Date: Tue, 9 Feb 2016 14:10:55 +0900
Subject: vim-patch:7.4.915

Problem:    When removing from 'path' and then adding, a comma may go missing.
            (Malcolm Rowe)
Solution:   Fix the check for P_ONECOMMA. (closes #471)

https://github.com/vim/vim/commit/174674743d9a2d7361c9cd89836f8dd8651edeeb
---
 src/nvim/option.c  | 3 ++-
 src/nvim/version.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

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,
-- 
cgit