aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Mehne <github@nmehne.de>2014-12-14 13:25:18 +0100
committerJulian Mehne <github@nmehne.de>2014-12-14 14:37:42 +0100
commit850b0b8663e27406db4e6bc44ff5f075326526d4 (patch)
tree2b6de0782c5d2056c4625e8a2c05beb4b9b84310
parent64a32d55c59188f1e922ca438fdb2d65caa06665 (diff)
downloadrneovim-850b0b8663e27406db4e6bc44ff5f075326526d4.tar.gz
rneovim-850b0b8663e27406db4e6bc44ff5f075326526d4.tar.bz2
rneovim-850b0b8663e27406db4e6bc44ff5f075326526d4.zip
vim-patch:7.4.463
Problem: Test 86 and 87 may hang on MS-Windows. Solution: Call inputrestore() after inputsave(). (Ken Takata) https://code.google.com/p/vim/source/detail?r=v7-4-463
-rw-r--r--src/nvim/testdir/test86.in1
-rw-r--r--src/nvim/testdir/test87.in1
-rw-r--r--src/nvim/version.c2
3 files changed, 3 insertions, 1 deletions
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..16efbbeee7 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -202,7 +202,7 @@ static int included_patches[] = {
467,
//465 NA
//464 NA
- //463,
+ 463,
//462,
//461 NA
//460,