mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-12 09:32:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #7328 from jamessan/keep-testdir-make

Browse Source 
Fix overzealous exclusions in vim-patch.sh
This commit is contained in:
Justin M. Keyes
2017-09-28 08:16:55 +02:00
committed by GitHub
parent 542ed5f5d3 f1242c2a26
commit c580ef68e8
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/vim-patch.sh
View File

@@ -133,7 +133,7 @@ preprocess_patch() {
# Remove *.proto, Make*, gui_*, some if_* # Remove *.proto, Make*, gui_*, some if_*
local na_src='proto\|Make*\|gui_*\|if_lua\|if_mzsch\|if_olepp\|if_ole\|if_perl\|if_py\|if_ruby\|if_tcl\|if_xcmdsrv' local na_src='proto\|Make*\|gui_*\|if_lua\|if_mzsch\|if_olepp\|if_ole\|if_perl\|if_py\|if_ruby\|if_tcl\|if_xcmdsrv'
2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/src/\S*\<\%('${na_src}'\)@norm! d/\v(^diff)|%$ 2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/src/\S*\<\%(testdir/\)\@<!\%('${na_src}'\)@norm! d/\v(^diff)|%$
' +w +q "$file" ' +w +q "$file"
# Remove channel.txt, netbeans.txt, os_*.txt, term.txt, todo.txt, version*.txt, tags # Remove channel.txt, netbeans.txt, os_*.txt, term.txt, todo.txt, version*.txt, tags

1
src/nvim/testdir/Makefile
View File

@@ -59,6 +59,7 @@ NEW_TESTS ?= \
test_matchadd_conceal.res \ test_matchadd_conceal.res \
test_matchadd_conceal_utf8.res \ test_matchadd_conceal_utf8.res \
test_mksession.res \ test_mksession.res \
test_mksession_utf8.res \
test_nested_function.res \ test_nested_function.res \
test_normal.res \ test_normal.res \
test_quickfix.res \ test_quickfix.res \