[vim] Output of chcp was not parsed correctly

By @gh4w and @janlazo

See 68b31a4a66
This commit is contained in:
Junegunn Choi 2019-09-29 14:51:38 +09:00
parent a5a97be017
commit ab11b74be4
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627

View File

@ -50,9 +50,9 @@ if s:is_win
" Use utf-8 for fzf.vim commands
" Return array of shell commands for cmd.exe
function! s:wrap_cmds(cmds)
return map(['@echo off', 'for /f "tokens=4" %%a in (''chcp'') do set origchcp=%%a', 'chcp 65001 > nul'] +
return map(['@echo off', 'setlocal enabledelayedexpansion', 'for /f "delims=: tokens=2" %%a in (''chcp'') do set origchcp=%%a', 'set origchcp=!origchcp: =!', 'chcp 65001 > nul'] +
\ (type(a:cmds) == type([]) ? a:cmds : [a:cmds]) +
\ ['chcp %origchcp% > nul'], 'v:val."\r"')
\ ['chcp !origchcp! > nul', 'setlocal disabledelayedexpansion'], 'v:val."\r"')
endfunction
else
let s:term_marker = ";#FZF"