diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/genvimvim.lua | 2 | ||||
| -rwxr-xr-x | scripts/vim-patch.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/genvimvim.lua b/scripts/genvimvim.lua index 9135c8e3ab..2a82181841 100644 --- a/scripts/genvimvim.lua +++ b/scripts/genvimvim.lua @@ -123,7 +123,7 @@ for line in eval_fd:lines() do if line == '};' then break end - local func_name = line:match('^ {"(%w+)",') + local func_name = line:match('^ { "([%w_]+)",') if func_name then if lld.line_length > 850 then w('\n' .. vimfun_start) diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh index a40090d4c3..3997bd52b1 100755 --- a/scripts/vim-patch.sh +++ b/scripts/vim-patch.sh @@ -137,7 +137,7 @@ get_vim_patch() { # Patch surgery: preprocess the patch. # - transform src/ paths to src/nvim/ local vim_full - vim_full="$(git show -1 --pretty=medium "${vim_commit}" \ + vim_full="$(git --no-pager show --color=never -1 --pretty=medium "${vim_commit}" \ | LC_ALL=C sed -e 's/\( [ab]\/src\)/\1\/nvim/g')" local neovim_branch="${BRANCH_PREFIX}${vim_version}" @@ -290,7 +290,7 @@ list_vim_patches() { is_missing="$(sed -n '/static int included_patches/,/}/p' "${NEOVIM_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 show --name-only "v${vim_commit}" 2>/dev/null) | grep -q ^runtime; then + if (cd "${VIM_SOURCE_DIR}" && git --no-pager show --color=never --name-only "v${vim_commit}" 2>/dev/null) | grep -q ^runtime; then vim_commit="${vim_commit} (+runtime)" fi else |