From ab11b74be4b0c9fac88d95f0f563d0dc0cb06ed3 Mon Sep 17 00:00:00 2001
From: Junegunn Choi <junegunn.c@gmail.com>
Date: Sun, 29 Sep 2019 14:51:38 +0900
Subject: [PATCH] [vim] Output of chcp was not parsed correctly

By @gh4w and @janlazo

See https://github.com/junegunn/vim-plug/commit/68b31a4a66ec945ff299db25a8a6382cd48edf14
---
 plugin/fzf.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin/fzf.vim b/plugin/fzf.vim
index a138c4f..6055b24 100644
--- a/plugin/fzf.vim
+++ b/plugin/fzf.vim
@@ -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"