aboutsummaryrefslogtreecommitdiff
path: root/scripts/vim-patch.sh
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2017-09-27 08:20:43 -0400
committerJames McCoy <jamessan@jamessan.com>2017-09-27 08:20:43 -0400
commite6d4b7686ca31d44de854bdfd417da083fea5fc4 (patch)
tree863f7fd50dbf6c2732a125f96200fdce508c3469 /scripts/vim-patch.sh
parent542ed5f5d31647bfec6d3119f4e2993544530c35 (diff)
downloadrneovim-e6d4b7686ca31d44de854bdfd417da083fea5fc4.tar.gz
rneovim-e6d4b7686ca31d44de854bdfd417da083fea5fc4.tar.bz2
rneovim-e6d4b7686ca31d44de854bdfd417da083fea5fc4.zip
vim-patch.sh: Exclude testdir/ files from src/ file pruning
Without the testdir/ exclusion, all directories under src/ were affected by this cleanup. However, testdir/ has its own pruning that happens later.
Diffstat (limited to 'scripts/vim-patch.sh')
-rwxr-xr-xscripts/vim-patch.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index 5ebb6a38b3..4f6bb40488 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -133,7 +133,7 @@ preprocess_patch() {
# 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'
- 2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/src/\S*\<\%('${na_src}'\)@norm! d/\v(^diff)|%$ ' +w +q "$file"
+ 2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/src/\S*\<\%(testdir/\)\@<!\%('${na_src}'\)@norm! d/\v(^diff)|%$ ' +w +q "$file"
# Remove channel.txt, netbeans.txt, os_*.txt, term.txt, todo.txt, version*.txt, tags
local na_doc='channel\.txt\|netbeans\.txt\|os_\w\+\.txt\|term\.txt\|todo\.txt\|version\d\.txt\|tags'