From 6f4c4be95288f83247c43e8c71218266019823ec Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sun, 28 Jan 2018 12:33:22 +0100 Subject: [PATCH 1/3] ex_diffpatch: don't need redraw_later(CLEAR), Nvim uses pipes --- src/nvim/diff.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/nvim/diff.c b/src/nvim/diff.c index a32ac645e3..e9ecf98653 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -941,9 +941,6 @@ void ex_diffpatch(exarg_T *eap) } #endif - // patch probably has written over the screen - redraw_later(CLEAR); - // Delete any .orig or .rej file created. STRCPY(buf, tmp_new); STRCAT(buf, ".orig"); From 8821579baa9d779335cd2c2331336acd8d74b9d7 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sun, 28 Jan 2018 13:16:33 +0100 Subject: [PATCH 2/3] test/old: $TMPDIR must be absolute Internals `chdir` here and there, this causes relative $TMPDIR to break some things. Don't know why this only happened on macOS... --- src/nvim/testdir/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index 5a6e03f182..b945b29683 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -11,7 +11,7 @@ SCRIPTSOURCE := ../../../runtime export SHELL := sh export NVIM_PRG := $(NVIM_PRG) -export TMPDIR := Xtest-tmpdir +export TMPDIR := $(abspath ../../../Xtest-tmpdir) SCRIPTS_DEFAULT = \ test14.out \ From f9b738235e572a7df38db7fe40cbdf97ecfd210f Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sun, 28 Jan 2018 22:29:17 +0100 Subject: [PATCH 3/3] test/old: fix Test_set_completion() Vim's src/testdir has more directories in it, so the "./samples/" item happens to have a space in front of it. This isn't relevant to the test, so just elide the space for our case. --- src/nvim/testdir/test_options.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nvim/testdir/test_options.vim b/src/nvim/testdir/test_options.vim index d1536b5c43..8af315fdea 100644 --- a/src/nvim/testdir/test_options.vim +++ b/src/nvim/testdir/test_options.vim @@ -152,8 +152,8 @@ func Test_set_completion() " Expand directories. call feedkeys(":set cdpath=./\\\"\", 'tx') - call assert_match(' ./samples/ ', @:) - call assert_notmatch(' ./small.vim ', @:) + call assert_match('./samples/ ', @:) + call assert_notmatch('./small.vim ', @:) " Expand files and directories. call feedkeys(":set tags=./\\\"\", 'tx')