diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-04-05 20:10:20 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-04-06 02:10:20 +0200 |
| commit | 210b013ce75b5ea8a897071e32decc1e1f88189e (patch) | |
| tree | 3492f415dccf7c9db8c684a2e4859e0508c83efc /scripts/vim-patch.sh | |
| parent | cde51dd6f4ec91c4458dbdfaceee4110904e1fa8 (diff) | |
| download | rneovim-210b013ce75b5ea8a897071e32decc1e1f88189e.tar.gz rneovim-210b013ce75b5ea8a897071e32decc1e1f88189e.tar.bz2 rneovim-210b013ce75b5ea8a897071e32decc1e1f88189e.zip | |
vim-patch: Update regex for included_patches array (#6449)
28dafe3ff const-ified the array without updating the regex.
[ci skip]
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 d02eef6b44..c8ae36cc3b 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -321,7 +321,7 @@ list_vim_patches() { if [[ -n "${vim_tag}" ]]; then local patch_number="${vim_tag:5}" # Remove prefix like "v7.4." # Tagged Vim patch, check version.c: - is_missing="$(sed -n '/static int included_patches/,/}/p' "${NVIM_SOURCE_DIR}/src/nvim/version.c" | + is_missing="$(sed -n '/static const int included_patches/,/}/p' "${NVIM_SOURCE_DIR}/src/nvim/version.c" | grep -x -e "[[:space:]]*//[[:space:]]${patch_number} NA.*" -e "[[:space:]]*${patch_number}," >/dev/null && echo "false" || echo "true")" vim_commit="${vim_tag#v}" if (cd "${VIM_SOURCE_DIR}" && git --no-pager show --color=never --name-only "v${vim_commit}" 2>/dev/null) | grep -q ^runtime; then |