diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-09-30 21:38:29 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-09-30 21:38:29 +0800 |
| commit | fae55937ac31c0d61c2c89ed0e9be43f3bd2a759 (patch) | |
| tree | 867047f682375264f46958a2d95ae18c15288a79 /scripts | |
| parent | c3de878ab1c3d1001660c3b3d6ce39fbc4fcd03c (diff) | |
| parent | 95458609ab1a97416b2f329613704be44a2f562e (diff) | |
| download | rneovim-fae55937ac31c0d61c2c89ed0e9be43f3bd2a759.tar.gz rneovim-fae55937ac31c0d61c2c89ed0e9be43f3bd2a759.tar.bz2 rneovim-fae55937ac31c0d61c2c89ed0e9be43f3bd2a759.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/vim-patch.sh | 2 |
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' |