From c4896c38735d5fd7e09e0119d521d329ddab9726 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sun, 13 Oct 2019 08:47:30 -0400 Subject: [PATCH] Use chcp only if sed is in PATH --- plug.vim | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/plug.vim b/plug.vim index 2571fe3..b8a07f1 100644 --- a/plug.vim +++ b/plug.vim @@ -353,14 +353,16 @@ if s:is_win " Copied from fzf function! s:wrap_cmds(cmds) + let use_chcp = executable('sed') return map([ \ '@echo off', - \ 'setlocal enabledelayedexpansion', - \ 'for /f "tokens=*" %%a in (''chcp'') do for %%b in (%%a) do set origchcp=%%b', - \ 'chcp 65001 > nul' - \ ] + \ 'setlocal enabledelayedexpansion'] + \ + (use_chcp ? [ + \ 'for /f "usebackq" %%a in (`chcp ^| sed "s/[^0-9]//gp"`) do set origchcp=%%a', + \ 'chcp 65001 > nul'] : []) \ + (type(a:cmds) == type([]) ? a:cmds : [a:cmds]) - \ + ['chcp !origchcp! > nul', 'endlocal'], + \ + (use_chcp ? ['chcp !origchcp! > nul'] : []) + \ + ['endlocal'], \ 'v:val."\r"') endfunction