From 4a3a5ee70daeca7c9d361ef92bf77305e1927211 Mon Sep 17 00:00:00 2001
From: Junegunn Choi <junegunn.c@gmail.com>
Date: Sun, 15 Jun 2014 12:15:39 +0900
Subject: [PATCH] [vim] External terminal emulator for GVim
---
README.md | 22 +++++++++++++---------
plugin/fzf.vim | 18 +++++++-----------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/README.md b/README.md
index ca3c3a43..cce72008 100644
--- a/README.md
+++ b/README.md
@@ -287,7 +287,7 @@ TODO :smiley:
Usage as Vim plugin
-------------------
-(Note: To use fzf in GVim, bash and xterm are required.)
+(Note: To use fzf in GVim, an external terminal emulator is required.)
### `:FZF[!]`
@@ -311,11 +311,15 @@ If you're on a tmux session, `:FZF` will launch fzf in a new split-window whose
height can be adjusted with `g:fzf_tmux_height` (default: '40%'). However, the
bang version (`:FZF!`) will always start in fullscreen.
-In GVim, `xterm` command will be used to launch fzf. You can set options to
-`xterm` command with `g:fzf_xterm_options`. For example,
+In GVim, you need an external terminal emulator to start fzf with. `xterm`
+command is used by default, but you can customize it with `g:fzf_launcher`.
```vim
-let g:fzf_xterm_options = '-geometry 120x30'
+" This is the default. %s is replaced with fzf command
+let g:fzf_launcher = 'xterm -e bash -ic %s'
+
+" Use urxvt instead
+let g:fzf_launcher = 'urxvt -geometry 120x30 -e sh -c %s'
```
### `fzf#run([options])`
@@ -335,7 +339,7 @@ of the selected items.
| `dir` | string | Working directory |
| `tmux_width` | number/string | Use tmux vertical split with the given height (e.g. `20`, `50%`) |
| `tmux_height` | number/string | Use tmux horizontal split with the given height (e.g. `20`, `50%`) |
-| `xterm_options` | string | Options to `xterm` command (Only used in GVim) |
+| `launcher` | string | External terminal emulator to start fzf with (Only used in GVim) |
#### Examples
@@ -361,10 +365,10 @@ nnoremap <silent> <Leader>C :call fzf#run({
\ 'source':
\ map(split(globpath(&rtp, "colors/*.vim"), "\n"),
\ "substitute(fnamemodify(v:val, ':t'), '\\..\\{-}$', '', '')"),
-\ 'sink': 'colo',
-\ 'options': '+m',
-\ 'tmux_width': 20,
-\ 'xterm_options': '-geometry 20x30'
+\ 'sink': 'colo',
+\ 'options': '+m',
+\ 'tmux_width': 20,
+\ 'launcher': 'xterm -geometry 20x30 -e bash -ic %s'
\ })<CR>
```
diff --git a/plugin/fzf.vim b/plugin/fzf.vim
index 78d8c2e3..919c3f0a 100644
--- a/plugin/fzf.vim
+++ b/plugin/fzf.vim
@@ -24,7 +24,7 @@
let s:min_tmux_width = 10
let s:min_tmux_height = 3
let s:default_tmux_height = '40%'
-let s:gui_supported = executable('bash') && executable('xterm')
+let s:launcher = 'xterm -e bash -ic %s'
let s:cpo_save = &cpo
set cpo&vim
@@ -68,12 +68,6 @@ function! s:escape(path)
endfunction
function! fzf#run(...) abort
- if has('gui_running') && !s:gui_supported
- echohl Error
- echo 'bash and xterm required to run fzf in GVim'
- return []
- endif
-
let dict = exists('a:1') ? a:1 : {}
let temps = { 'result': tempname() }
let optstr = get(dict, 'options', '')
@@ -125,14 +119,16 @@ function! s:execute(dict, command, temps)
call s:pushd(a:dict)
silent !clear
if has('gui_running')
- let xterm_options = get(a:dict, 'xterm_options', get(g:, 'fzf_xterm_options', ''))
- execute "silent !xterm ".xterm_options.
- \ " -e bash -ic '".substitute(a:command, "'", "'\"'\"'", 'g')."'"
+ let launcher = get(a:dict, 'launcher', get(g:, 'fzf_launcher', s:launcher))
+ let command = printf(launcher, "'".substitute(a:command, "'", "'\"'\"'", 'g')."'")
else
- execute 'silent !'.a:command
+ let command = a:command
endif
+ execute 'silent !'.command
redraw!
if v:shell_error
+ echohl Error
+ echo 'Error running ' . command
return []
else
return s:callback(a:dict, a:temps, 0)
--
GitLab