summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Edmund Lazo <janedmundlazo@hotmail.com>2017-09-03 15:44:01 -0400
committerJunegunn Choi <junegunn.c@gmail.com>2017-09-05 13:29:46 +0900
commitfd6bc7308f4109a96ff05715434f60574d1e7670 (patch)
tree127405dc027b1b0694bb16991688f745649b688d
parent6c41c95f282861d1cd49827d4a1ca992944a861f (diff)
[vim] Use s:execute_term in Windows
IMPORTANT: cmd.exe and powershell are fine in default Windows terminal. cmd.exe prompt is broken on ConEmu because it natively supports ucs-2 only. utf-16 support is exclusive to .Net (ie. powershell). utf-8 supports requires chcp, external program, but does not fix the cmd.exe prompt. Use powershell on ConEmu to avoid corrupted text on display
-rw-r--r--plugin/fzf.vim2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugin/fzf.vim b/plugin/fzf.vim
index e18b23c7..1ffb45b2 100644
--- a/plugin/fzf.vim
+++ b/plugin/fzf.vim
@@ -389,7 +389,7 @@ try
let use_height = has_key(dict, 'down') &&
\ !(has('nvim') || s:is_win || has('win32unix') || s:present(dict, 'up', 'left', 'right')) &&
\ executable('tput') && filereadable('/dev/tty')
- let use_term = has('nvim-0.2.1') || (has('nvim') && !s:is_win) || (has('terminal') && has('gui_running') && has('patch-8.0.995'))
+ let use_term = has('nvim-0.2.1') || (has('nvim') && !s:is_win) || (has('terminal') && has('patch-8.0.995') && (has('gui_running') || s:is_win))
let use_tmux = (!use_height && !use_term || prefer_tmux) && !has('win32unix') && s:tmux_enabled() && s:splittable(dict)
if prefer_tmux && use_tmux
let use_height = 0