IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge #7924 'test/old: various fixes'

Browse Source
This commit is contained in:
Justin M. Keyes 2018-01-28 22:51:51 +01:00 committed by GitHub
commit b251c42195
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/diff.c
View File

@ -941,9 +941,6 @@ void ex_diffpatch(exarg_T *eap)
} }
#endif #endif
// patch probably has written over the screen
redraw_later(CLEAR);
// Delete any .orig or .rej file created. // Delete any .orig or .rej file created.
STRCPY(buf, tmp_new); STRCPY(buf, tmp_new);
STRCAT(buf, ".orig"); STRCAT(buf, ".orig");

2
src/nvim/testdir/Makefile
View File

@ -11,7 +11,7 @@ SCRIPTSOURCE := ../../../runtime
export SHELL := sh export SHELL := sh
export NVIM_PRG := $(NVIM_PRG) export NVIM_PRG := $(NVIM_PRG)
export TMPDIR := Xtest-tmpdir export TMPDIR := $(abspath ../../../Xtest-tmpdir)
SCRIPTS_DEFAULT = \ SCRIPTS_DEFAULT = \
test14.out \ test14.out \