aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-12-11 00:54:25 +0100
committerJustin M. Keyes <justinkz@gmail.com>2017-12-11 00:54:25 +0100
commit23fb833ea75107a3349dfb0be2eeccc06111399c (patch)
tree0805cdd41094924629c1b19ae75b2df30036d9a1
parent56b49955b70aa803f9fb42e48a147f1881ecb33c (diff)
downloadrneovim-23fb833ea75107a3349dfb0be2eeccc06111399c.tar.gz
rneovim-23fb833ea75107a3349dfb0be2eeccc06111399c.tar.bz2
rneovim-23fb833ea75107a3349dfb0be2eeccc06111399c.zip
vim-patch.sh: remove version.c in generated patch
Vim patch tracking is now driven completely by `vim-patch:xxx` tokens in the VCS logs. version.c will be auto-generated, if it is used at all.
-rwxr-xr-xscripts/vim-patch.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index bac5657cc6..04bc16dd25 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -148,6 +148,10 @@ preprocess_patch() {
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"
+ # Remove version.c #7555
+ local na_po='version.c'
+ 2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/src/\<\%('${na_po}'\)\>@norm! d/\v(^diff)|%$ ' +w +q "$file"
+
# Remove some *.po files. #5622
local na_po='sjiscorr.c\|ja.sjis.po\|ko.po\|pl.cp1250.po\|pl.po\|ru.cp1251.po\|uk.cp1251.po\|zh_CN.cp936.po\|zh_CN.po\|zh_TW.po'
2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/src/po/\<\%('${na_po}'\)\>@norm! d/\v(^diff)|%$ ' +w +q "$file"