From 0df1b6655be5385c9cbb70dca1c042c6447ec50b Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sat, 29 Apr 2017 16:56:40 +0200 Subject: doc: Removed t_XX options/keycodes. (#6616) Closes #4482 TODO: revisit find_key_option_len() --- scripts/vim-patch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/vim-patch.sh') diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index 3ade90a65b..3b083e7b83 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -136,7 +136,7 @@ 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\|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" # Remove "Last change ..." changes in doc files. -- cgit From 6eb2bcd1a02872433871cc53f525e90dc03fe4dd Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 11 Jun 2017 16:25:13 +0200 Subject: scripts/vim-patch.sh: do not git-reset on push failure (#6878) This was added from the beginning to submit_pr in 775a16b0b, but I cannot see why that is useful - in contrast, it will mess with the local branch in case "origin" cannot be pushed to (i.e. when it points to neovim/neovim itself). --- scripts/vim-patch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/vim-patch.sh') diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index 3b083e7b83..63665b9253 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -280,7 +280,7 @@ submit_pr() { echo "Pushing to 'origin/${checked_out_branch}'." output="$(git push origin "${checked_out_branch}" 2>&1)" && echo "✔ ${output}" || - (echo "✘ ${output}"; git reset --soft HEAD^1; false) + (echo "✘ ${output}"; false) echo fi -- cgit