Merge pull request #1668 from three-comrades/patches

vim-patch:7.4.463 + vim-patch:7.4.470

5 files changed, 75 insertions, 9 deletions

diff --git a/src/nvim/testdir/test100.in b/src/nvim/testdir/test100.in
index f6d2e3711b..2bf931fd4f 100644
--- a/src/nvim/testdir/test100.in
+++ b/src/nvim/testdir/test100.in
@@ -16,7 +16,7 @@ STARTTEST
 :new one
 :0put ='ONE: expecting global undolevels: 5, local undolevels: -123456 (default)'
 :call FillBuffer()
-:call feedkeys(":earlier 10\n", 't')
+:earlier 10
 :call UndoLevel()
 :set ft=unix
 :%w! test.out
@@ -24,7 +24,7 @@ STARTTEST
 :0put ='TWO: expecting global undolevels: 5, local undolevels: 2 (first) then 10 (afterwards)'
 :setlocal ul=2
 :call FillBuffer()
-:call feedkeys(":earlier 10\n", 't')
+:earlier 10
 :call UndoLevel()
 :setlocal ul=10
 :call UndoLevel()
diff --git a/src/nvim/testdir/test11.in b/src/nvim/testdir/test11.in
index 47de470a2d..9e9e257c1d 100644
--- a/src/nvim/testdir/test11.in
+++ b/src/nvim/testdir/test11.in
@@ -46,13 +46,13 @@ STARTTEST
 :w>>test.out                    " Append it to the output file
 :set shelltemp                  " need temp files here
 :au FilterReadPre   *.out  call rename(expand("<afile>"), expand("<afile>") . ".t")
-:au FilterReadPre   *.out  exe '!sed s/e/E/ ' . shellescape(expand("<afile>")) . ".t >" . shellescape(expand("<afile>"))
-:au FilterReadPre   *.out  exe '!rm ' . shellescape(expand("<afile>")) . '.t'
+:au FilterReadPre   *.out  exe 'silent !sed s/e/E/ ' . shellescape(expand("<afile>")) . ".t >" . shellescape(expand("<afile>"))
+:au FilterReadPre   *.out  exe 'silent !rm ' . shellescape(expand("<afile>")) . '.t'
 :au FilterReadPost  *.out  '[,']s/x/X/g
 :e! test.out                    " Edit the output file
 :23,$!cat
 :23,$s/\r$//                 " remove CR for when sed adds them
-:au! FileReadPre    *.gz   exe '!gzip -d ' . shellescape(expand("<afile>"))
+:au! FileReadPre    *.gz   exe 'silent !gzip -d ' . shellescape(expand("<afile>"))
 :au  FileReadPre    *.gz   call rename(expand("<afile>:r"), expand("<afile>"))
 :au! FileReadPost   *.gz   '[,']s/l/L/
 :$r Xtestfile.gz             " Read compressed file
diff --git a/src/nvim/testdir/test86.in b/src/nvim/testdir/test86.in
index 11ff35cfd3..99102c4d89 100644
--- a/src/nvim/testdir/test86.in
+++ b/src/nvim/testdir/test86.in
@@ -1383,6 +1383,7 @@ EOF
 :debug silent! py test_keyboard_interrupt()
 :redir END
 :0 debuggreedy
+:call inputrestore()
 :silent $put =output
 :unlet output
 :py del test_keyboard_interrupt
diff --git a/src/nvim/testdir/test87.in b/src/nvim/testdir/test87.in
index e45883b59d..0bb5119624 100644
--- a/src/nvim/testdir/test87.in
+++ b/src/nvim/testdir/test87.in
@@ -1360,6 +1360,7 @@ EOF
 :debug silent! py3 test_keyboard_interrupt()
 :redir END
 :0 debuggreedy
+:call inputrestore()
 :silent $put =output
 :unlet output
 :py3 del test_keyboard_interrupt
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 0f0827958f..f643fa5c85 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -178,6 +178,70 @@ static char *(features[]) = {
 };
 
 static int included_patches[] = {
+  //552,
+  //551,
+  //550,
+  //549,
+  //548,
+  //547,
+  //546,
+  //545,
+  //544,
+  //543,
+  //542,
+  //541,
+  //540,
+  //539,
+  //538,
+  //537,
+  //536,
+  //535,
+  //534,
+  //533,
+  //532,
+  //531,
+  //530,
+  //529,
+  //528,
+  //527,
+  //526,
+  //525,
+  //524,
+  //523,
+  //522,
+  //521,
+  //520,
+  //519,
+  //518,
+  //517,
+  //516,
+  //515,
+  //514,
+  //513,
+  //512,
+  //511,
+  //510,
+  //509,
+  //508,
+  //507,
+  //506,
+  //505,
+  //504,
+  //503,
+  //502,
+  //501,
+  //500,
+  //499,
+  //498,
+  //497,
+  //496,
+  //495,
+  //494,
+  //493,
+  //492,
+  //491,
+  //490,
+  //489,
   //488,
   //487,
   //486,
@@ -196,23 +260,23 @@ static int included_patches[] = {
   473,
   472,
   //471 NA
-  //470,
+  470,
   //469 NA
   //468,
   467,
   //465 NA
   //464 NA
-  //463,
+  463,
   //462,
   //461 NA
-  //460,
+  //460 NA
   //459,
   //458,
   //457,
   //456,
   //455,
   454,
-  //453,
+  //453 NA
   //452,
   //451,
   //450,