diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-03-21 13:52:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-21 13:52:38 +0100 |
| commit | 2611ba8abb19a3b1f910d4c29eed5039a819e712 (patch) | |
| tree | 583c36f5830159224d746958430f96b9d724591f /scripts | |
| parent | 66259e4c498dd3b5278aeea16cc3a71ed83f1b76 (diff) | |
| parent | cc421270ee6fd3fbd6e1e7bd766f71e1db30c7b5 (diff) | |
| download | rneovim-2611ba8abb19a3b1f910d4c29eed5039a819e712.tar.gz rneovim-2611ba8abb19a3b1f910d4c29eed5039a819e712.tar.bz2 rneovim-2611ba8abb19a3b1f910d4c29eed5039a819e712.zip | |
Merge #6324 from justinmk/vim-patch-bc8801c9317eb
vim-patch.sh, vim-patch:bc8801c9317eb
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/vim-patch.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index bf4b7d9080..d02eef6b44 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -109,7 +109,7 @@ assign_commit_details() { local strip_commit_line=true else # Interpret parameter as commit hash. - vim_version="${1:0:7}" + vim_version="${1:0:12}" vim_commit=$(cd "${VIM_SOURCE_DIR}" \ && git log -1 --format="%H" "${vim_version}") local strip_commit_line=false @@ -136,9 +136,12 @@ preprocess_patch() { 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 - local na_doc='channel\.txt\|netbeans\.txt\|os_\w\+\.txt\|todo\.txt\|version\d\.txt\|tags$' + local na_doc='channel\.txt\|netbeans\.txt\|os_\w\+\.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" + # Remove "Last change ..." changes in doc files. + 2>/dev/null $nvim --cmd 'set dir=/tmp' +'%s/^@@.*\n.*For Vim version.*Last change.*\n.*For Vim version.*Last change.*//' +w +q "$file" + # Remove some testdir/Make_*.mak files local na_src_testdir='Make_amiga.mak\|Make_dos.mak\|Make_ming.mak\|Make_vms.mms' 2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/src/testdir/\%('${na_src_testdir}'\)@norm! d/\v(^diff)|%$
' +w +q "$file" |