Skip to content

Add MSYS2 support as a vim plugin #1677

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
junegunn merged 7 commits into from
Dec 15, 2019
+8 −5
Merged

Add MSYS2 support as a vim plugin #1677

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
43213de
Add MSYS2 support as a vim plugin
msr1k Aug 31, 2019
c95d52f
Change shellescape default value depending on s:is_win flag
msr1k Aug 31, 2019
502432f
Make TERM environment empty only when gui is running
msr1k Sep 22, 2019
ca770ec
Stop checking &shell in fzf#shellescape function
msr1k Sep 22, 2019
abde451
Take neovim into consideration when to set shellcmdflag
msr1k Sep 26, 2019
637d59f
Add &shellxquote control
msr1k Dec 6, 2019
a1bbd6b
Merge branch 'master' into vim-plugin-msys-support
junegunn Dec 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions plugin/fzf.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ if s:is_win
return map([
\ '@echo off',
\ 'setlocal enabledelayedexpansion']
\ + (has('gui_running') ? ['set TERM= > nul'] : [])

@janlazo janlazo Dec 12, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should port this over to vim-plug.

\ + (type(a:cmds) == type([]) ? a:cmds : [a:cmds])
\ + ['endlocal'],
\ printf('iconv(v:val."\r", "%s", "cp%d")', &encoding, s:codepage))
Expand All @@ -79,7 +80,7 @@ function! s:shellesc_cmd(arg)
endfunction

function! fzf#shellescape(arg, ...)
let shell = get(a:000, 0, &shell)
let shell = get(a:000, 0, s:is_win ? 'cmd.exe' : 'sh')
if shell =~# 'cmd.exe$'
return s:shellesc_cmd(a:arg)
endif
Expand Down Expand Up @@ -338,19 +339,21 @@ function! fzf#wrap(...)
endfunction

function! s:use_sh()
let [shell, shellslash] = [&shell, &shellslash]
let [shell, shellslash, shellcmdflag, shellxquote] = [&shell, &shellslash, &shellcmdflag, &shellxquote]
if s:is_win
set shell=cmd.exe
set noshellslash
let &shellcmdflag = has('nvim') ? '/s /c' : '/c'
Comment thread
junegunn marked this conversation as resolved.
let &shellxquote = has('nvim') ? '"' : '('
else
set shell=sh
endif
return [shell, shellslash]
return [shell, shellslash, shellcmdflag, shellxquote]
endfunction

function! fzf#run(...) abort
try
let [shell, shellslash] = s:use_sh()
let [shell, shellslash, shellcmdflag, shellxquote] = s:use_sh()

let dict = exists('a:1') ? s:upgrade(a:1) : {}
let temps = { 'result': s:fzf_tempname() }
Expand Down Expand Up @@ -420,7 +423,7 @@ try
call s:callback(dict, lines)
return lines
finally
let [&shell, &shellslash] = [shell, shellslash]
let [&shell, &shellslash, &shellcmdflag, &shellxquote] = [shell, shellslash, shellcmdflag, shellxquote]
endtry
endfunction

Expand Down