diff options
| author | ckelsel <ckelsel@hotmail.com> | 2017-08-05 09:56:31 +0800 |
|---|---|---|
| committer | ckelsel <ckelsel@hotmail.com> | 2017-08-05 09:56:31 +0800 |
| commit | 0743684199238006331032ca26a947c579c59a5e (patch) | |
| tree | 1d5bb4969bcf901e9d1ecd8472856f9c93883c66 /scripts | |
| parent | 9b3ed62b5a841c24f798f1fcc4adb3cfe7667b5b (diff) | |
| parent | 37dd5ded7c74d70358ab0539d6ed978816b778f5 (diff) | |
| download | rneovim-0743684199238006331032ca26a947c579c59a5e.tar.gz rneovim-0743684199238006331032ca26a947c579c59a5e.tar.bz2 rneovim-0743684199238006331032ca26a947c579c59a5e.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 37c472ce5b..5ebb6a38b3 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -135,7 +135,7 @@ preprocess_patch() { 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" - # Remove channel.txt, netbeans.txt, os_*.txt, todo.txt, version*.txt, tags + # 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' 2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/runtime/doc/\<\%('${na_doc}'\)\>@norm! d/\v(^diff)|%$
' +w +q "$file" |