diff --git a/plugin/rspec.vim b/plugin/rspec.vim index 34f7372..a1f0c3a 100644 --- a/plugin/rspec.vim +++ b/plugin/rspec.vim @@ -69,7 +69,7 @@ function! s:RspecCommandProvided() endfunction function! s:DefaultTerminalCommand() - return "!" . s:ClearCommand() . " && echo " . s:default_command . " && " . s:default_command + return "!" . s:ClearCommand() . s:AndCommand() . "echo " . s:default_command . s:AndCommand() . s:default_command endfunction function! s:CurrentFilePath() @@ -88,6 +88,14 @@ function! s:ClearCommand() endif endfunction +function! s:AndCommand() + if &shell[-4:] == "fish" + return "; and " + else + return " && " + endif +endfunction + function! s:IsMacGui() return s:force_gui || (has("gui_running") && has("gui_macvim")) endfunction