Merge pull request #4204 from watiko/vim-7.4.915

vim-patch:7.4.{749,915}

test/functional/legacy/options_spec.lua

@@ -1,13 +1,27 @@
--- Test if ":options" throws any exception. The options window seems to mess
--- other tests, so restart nvim in the teardown hook
-
 local helpers = require('test.functional.helpers')
 local command, clear = helpers.command, helpers.clear
+local source, expect = helpers.source, helpers.expect
 
 describe('options', function()
   setup(clear)
 
-  it('is working', function()
+  it('should not throw any exception', function()
     command('options')
   end)
 end)
+
+describe('set', function()
+  setup(clear)
+
+  it("should keep two comma when 'path' is changed", function()
+    source([[
+      set path=foo,,bar
+      set path-=bar
+      set path+=bar
+      $put =&path]])
+
+    expect([[
+      
+      foo,,bar]])
+  end)
+end)