From 1253c99eb8b626aedc1a39a1a459e4fdf3c233e3 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Thu, 5 May 2016 20:36:27 -0400
Subject: [PATCH 1/4] vim-patch:40a346d

Update gitignore for files created when running tests.

https://github.com/vim/vim/commit/40a346dc19a75f2be1b2d491053487cf365dd7d4
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 23c8fd1957..94bb54c661 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ tags
 /src/nvim/testdir/tiny.vim
 /src/nvim/testdir/test*.out
 /src/nvim/testdir/test.log
+/src/nvim/testdir/messages
 /src/nvim/testdir/viminfo
 /src/nvim/testdir/test.ok
 /src/nvim/testdir/*.failed

From c6ff71e00c8d4d2dad9e323efd8c02516554c363 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Thu, 5 May 2016 20:48:37 -0400
Subject: [PATCH 3/4] vim-patch:27a82e3

Add new file left out from patch 7.4.1034.

https://github.com/vim/vim/commit/27a82e31ee9acedb6922093b2764f7f6860b0f91
---
 test/functional/legacy/backspace_opt_spec.lua | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 test/functional/legacy/backspace_opt_spec.lua

diff --git a/test/functional/legacy/backspace_opt_spec.lua b/test/functional/legacy/backspace_opt_spec.lua
new file mode 100644
index 0000000000..b40019a410
--- /dev/null
+++ b/test/functional/legacy/backspace_opt_spec.lua
@@ -0,0 +1,67 @@
+local helpers = require('test.functional.helpers')
+local call, clear = helpers.call, helpers.clear
+local source, eq, nvim = helpers.source, helpers.eq, helpers.meths
+
+describe("test 'backspace' settings", function()
+  before_each(function()
+    clear()
+
+    source([[
+      func Exec(expr)
+        let str=''
+        try
+          exec a:expr
+        catch /.*/
+          let str=v:exception
+        endtry
+        return str
+      endfunc
+
+      func Test_backspace_option()
+        set backspace=
+        call assert_equal('', &backspace)
+        set backspace=indent
+        call assert_equal('indent', &backspace)
+        set backspace=eol
+        call assert_equal('eol', &backspace)
+        set backspace=start
+        call assert_equal('start', &backspace)
+        " Add the value
+        set backspace=
+        set backspace=indent
+        call assert_equal('indent', &backspace)
+        set backspace+=eol
+        call assert_equal('indent,eol', &backspace)
+        set backspace+=start
+        call assert_equal('indent,eol,start', &backspace)
+        " Delete the value
+        set backspace-=indent
+        call assert_equal('eol,start', &backspace)
+        set backspace-=start
+        call assert_equal('eol', &backspace)
+        set backspace-=eol
+        call assert_equal('', &backspace)
+        " Check the error
+        call assert_equal(0, match(Exec('set backspace=ABC'), '.*E474'))
+        call assert_equal(0, match(Exec('set backspace+=def'), '.*E474'))
+        " NOTE: Vim doesn't check following error...
+        "call assert_equal(0, match(Exec('set backspace-=ghi'), '.*E474'))
+
+        " Check backwards compatibility with version 5.4 and earlier
+        set backspace=0
+        call assert_equal('0', &backspace)
+        set backspace=1
+        call assert_equal('1', &backspace)
+        set backspace=2
+        call assert_equal('2', &backspace)
+        call assert_false(match(Exec('set backspace=3'), '.*E474'))
+        call assert_false(match(Exec('set backspace=10'), '.*E474'))
+      endfunc
+    ]])
+  end)
+
+  it('works', function()
+    call('Test_backspace_option')
+    eq({}, nvim.get_vvar('errors'))
+  end)
+end)

From 9aed8c3eb4315011ad1770646fe39b9d7179ece9 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Thu, 5 May 2016 21:48:13 -0400
Subject: [PATCH 4/4] version.c: Mark 7.4.1005 as NA, per discussion in #4191

---
 src/nvim/version.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/version.c b/src/nvim/version.c
index a475e25e92..21d0808a25 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -673,7 +673,7 @@ static int included_patches[] = {
   // 1008 NA
   // 1007,
   1006,
-  // 1005,
+  // 1005 NA,
   // 1004 NA,
   // 1003 NA,
   // 1002 NA,