diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-01-28 22:51:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-28 22:51:51 +0100 |
| commit | b251c42195eed801d7b05ac11ed803598961ba59 (patch) | |
| tree | 39125c21e97beebbbd32e77f482fb8960faa4a71 | |
| parent | 499c9a15531b7a0e9736a395e8d401ceab3d24d2 (diff) | |
| parent | f9b738235e572a7df38db7fe40cbdf97ecfd210f (diff) | |
| download | rneovim-b251c42195eed801d7b05ac11ed803598961ba59.tar.gz rneovim-b251c42195eed801d7b05ac11ed803598961ba59.tar.bz2 rneovim-b251c42195eed801d7b05ac11ed803598961ba59.zip | |
Merge #7924 'test/old: various fixes'
| -rw-r--r-- | src/nvim/diff.c | 3 | ||||
| -rw-r--r-- | src/nvim/testdir/Makefile | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_options.vim | 4 |
3 files changed, 3 insertions, 6 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"); 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 \ 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=./\<C-A>\<C-B>\"\<CR>", '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=./\<C-A>\<C-B>\"\<CR>", 'tx') |