From 86306dd45a71df4c5651b7895da4b31d49183ed6 Mon Sep 17 00:00:00 2001
From: Junegunn Choi <junegunn.c@gmail.com>
Date: Sat, 26 Sep 2015 21:04:44 +0900
Subject: [PATCH] [vim] Display proper error message when GVim launcher failed
Related: https://github.com/junegunn/fzf.vim/issues/16
---
plugin/fzf.vim | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugin/fzf.vim b/plugin/fzf.vim
index 117e03f6..0cb444f8 100644
--- a/plugin/fzf.vim
+++ b/plugin/fzf.vim
@@ -213,7 +213,7 @@ endfunction
function! s:xterm_launcher()
let fmt = 'xterm -T "[fzf]" -bg "\%s" -fg "\%s" -geometry %dx%d+%d+%d -e bash -ic %%s'
if has('gui_macvim')
- let fmt .= '; osascript -e "tell application \"MacVim\" to activate"'
+ let fmt .= '&& osascript -e "tell application \"MacVim\" to activate"'
endif
return printf(fmt,
\ synIDattr(hlID("Normal"), "bg"), synIDattr(hlID("Normal"), "fg"),
@@ -237,7 +237,7 @@ function! s:execute(dict, command, temps)
redraw!
if v:shell_error
" Do not print error message on exit status 1 (no match) or 130 (interrupt)
- if v:shell_error == 2
+ if index([1, 130], v:shell_error) < 0
call s:error('Error running ' . command)
endif
return []
--
GitLab