diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-08-06 15:25:17 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-08-06 15:25:17 +0300 |
| commit | 474aa823dc5680b06dc84cd2ae248e58b6e83359 (patch) | |
| tree | 1714a0878caecff1f3d9d69228c888728c824d15 /scripts/vim-patch.sh | |
| parent | 36acfce4eac9dd131a39c4dbdff2836ab3e21d73 (diff) | |
| parent | 5bec94652c9dd1d8cab260c4dd10e44d3f38f3cd (diff) | |
| download | rneovim-474aa823dc5680b06dc84cd2ae248e58b6e83359.tar.gz rneovim-474aa823dc5680b06dc84cd2ae248e58b6e83359.tar.bz2 rneovim-474aa823dc5680b06dc84cd2ae248e58b6e83359.zip | |
Merge branch 'master' into colored-cmdline
Diffstat (limited to 'scripts/vim-patch.sh')
| -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" |