Merge pull request #4319 from watiko/vim-7.4.952

vim-patch:7.4.952

3 files changed, 26 insertions, 48 deletions

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 552da03739..064a853b4c 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -338,7 +338,7 @@ static int included_patches[] = {
   955,
   // 954 NA
   953,
-  // 952,
+  952,
   // 951,
   950,
   949,
diff --git a/test/functional/legacy/100_lispwords_spec.lua b/test/functional/legacy/100_lispwords_spec.lua
deleted file mode 100644
index 739a02f0b3..0000000000
--- a/test/functional/legacy/100_lispwords_spec.lua
+++ /dev/null
@@ -1,47 +0,0 @@
--- Tests for 'lispwords' setting being global-local
-
-local helpers = require('test.functional.helpers')
-local source = helpers.source
-local clear, expect = helpers.clear, helpers.expect
-
-describe('lispwords', function()
-  setup(clear)
-
-  it('global-local', function()
-    source([[
-      setglobal lispwords=foo,bar,baz
-      setlocal lispwords-=foo 
-      setlocal lispwords+=quux
-      redir @A
-        echo "Testing 'lispwords' local value" 
-        setglobal lispwords? 
-        setlocal lispwords? 
-        echo &lispwords 
-        echo ''
-      redir end
-      setlocal lispwords<
-      redir @A
-        echo "Testing 'lispwords' value reset" 
-        setglobal lispwords? 
-        setlocal lispwords? 
-        echo &lispwords
-      redir end
-
-      0put a
-      $d
-    ]])
-
-    -- Assert buffer contents.
-    expect([[
-      
-      Testing 'lispwords' local value
-        lispwords=foo,bar,baz
-        lispwords=bar,baz,quux
-      bar,baz,quux
-      
-      Testing 'lispwords' value reset
-        lispwords=foo,bar,baz
-        lispwords=foo,bar,baz
-      foo,bar,baz]])
-  end)
-end)
diff --git a/test/functional/legacy/lispwords_spec.lua b/test/functional/legacy/lispwords_spec.lua
new file mode 100644
index 0000000000..48df4de55e
--- /dev/null
+++ b/test/functional/legacy/lispwords_spec.lua
@@ -0,0 +1,25 @@
+local helpers = require('test.functional.helpers')
+local clear = helpers.clear
+local eq = helpers.eq
+local eval = helpers.eval
+local execute = helpers.execute
+local source = helpers.source
+
+describe('lispwords', function()
+  before_each(clear)
+
+  it('should be set global-local',function()
+    source([[
+      setglobal lispwords=foo,bar,baz
+      setlocal lispwords-=foo
+      setlocal lispwords+=quux]])
+    eq('foo,bar,baz', eval('&g:lispwords'))
+    eq('bar,baz,quux', eval('&l:lispwords'))
+    eq('bar,baz,quux', eval('&lispwords'))
+
+    execute('setlocal lispwords<')
+    eq('foo,bar,baz', eval('&g:lispwords'))
+    eq('foo,bar,baz', eval('&l:lispwords'))
+    eq('foo,bar,baz', eval('&lispwords'))
+  end)
+end)