diff options
| author | Junegunn Choi <junegunn.c@gmail.com> | 2016-06-12 20:37:17 +0900 |
|---|---|---|
| committer | Junegunn Choi <junegunn.c@gmail.com> | 2016-06-12 20:48:23 +0900 |
| commit | c39c039e155c50bcf8fecc5956c4bdd3b5c6bea1 (patch) | |
| tree | 8e1ab125ec5ee5517cb2996d19cf269e22c66845 /shell | |
| parent | 07f176f426140fe297a79e4fba9f048e72c865f0 (diff) | |
[shell] Add $FZF_CTRL_T_OPTS and $FZF_ALT_C_OPTS
Close #596
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/key-bindings.bash | 6 | ||||
| -rw-r--r-- | shell/key-bindings.fish | 4 | ||||
| -rw-r--r-- | shell/key-bindings.zsh | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/shell/key-bindings.bash b/shell/key-bindings.bash index b87decaa..3e9dc654 100644 --- a/shell/key-bindings.bash +++ b/shell/key-bindings.bash @@ -5,7 +5,7 @@ __fzf_select__() { -o -type f -print \ -o -type d -print \ -o -type l -print 2> /dev/null | sed 1d | cut -b3-"}" - eval "$cmd" | fzf -m | while read -r item; do + eval "$cmd | fzf -m $FZF_CTRL_T_OPTS" | while read -r item; do printf '%q ' "$item" done echo @@ -26,7 +26,7 @@ __fzf_select_tmux__() { height="-l $height" fi - tmux split-window $height "cd $(printf %q "$PWD"); FZF_DEFAULT_OPTS=$(printf %q "$FZF_DEFAULT_OPTS") PATH=$(printf %q "$PATH") FZF_CTRL_T_COMMAND=$(printf %q "$FZF_CTRL_T_COMMAND") bash -c 'source \"${BASH_SOURCE[0]}\"; tmux send-keys -t $TMUX_PANE \"\$(__fzf_select__)\"'" + tmux split-window $height "cd $(printf %q "$PWD"); FZF_DEFAULT_OPTS=$(printf %q "$FZF_DEFAULT_OPTS") PATH=$(printf %q "$PATH") FZF_CTRL_T_COMMAND=$(printf %q "$FZF_CTRL_T_COMMAND") FZF_CTRL_T_OPTS=$(printf %q "$FZF_CTRL_T_OPTS") bash -c 'source \"${BASH_SOURCE[0]}\"; tmux send-keys -t $TMUX_PANE \"\$(__fzf_select__)\"'" } fzf-file-widget() { @@ -43,7 +43,7 @@ __fzf_cd__() { local cmd dir cmd="${FZF_ALT_C_COMMAND:-"command find -L . \\( -path '*/\\.*' -o -fstype 'dev' -o -fstype 'proc' \\) -prune \ -o -type d -print 2> /dev/null | sed 1d | cut -b3-"}" - dir=$(eval "$cmd" | $(__fzfcmd) +m) && printf 'cd %q' "$dir" + dir=$(eval "$cmd | $(__fzfcmd) +m $FZF_ALT_C_OPTS") && printf 'cd %q' "$dir" } __fzf_history__() ( diff --git a/shell/key-bindings.fish b/shell/key-bindings.fish index a02937ea..6c761772 100644 --- a/shell/key-bindings.fish +++ b/shell/key-bindings.fish @@ -19,7 +19,7 @@ function fzf_key_bindings -o -type f -print \ -o -type d -print \ -o -type l -print 2> /dev/null | sed 1d | cut -b3-" - eval "$FZF_CTRL_T_COMMAND | "(__fzfcmd)" -m > $TMPDIR/fzf.result" + eval "$FZF_CTRL_T_COMMAND | "(__fzfcmd)" -m $FZF_CTRL_T_OPTS > $TMPDIR/fzf.result" and for i in (seq 20); commandline -i (cat $TMPDIR/fzf.result | __fzf_escape) 2> /dev/null; and break; sleep 0.1; end commandline -f repaint rm -f $TMPDIR/fzf.result @@ -37,7 +37,7 @@ function fzf_key_bindings command find -L . \\( -path '*/\\.*' -o -fstype 'dev' -o -fstype 'proc' \\) -prune \ -o -type d -print 2> /dev/null | sed 1d | cut -b3-" # Fish hangs if the command before pipe redirects (2> /dev/null) - eval "$FZF_ALT_C_COMMAND | "(__fzfcmd)" +m > $TMPDIR/fzf.result" + eval "$FZF_ALT_C_COMMAND | "(__fzfcmd)" +m $FZF_ALT_C_OPTS > $TMPDIR/fzf.result" [ (cat $TMPDIR/fzf.result | wc -l) -gt 0 ] and cd (cat $TMPDIR/fzf.result) commandline -f repaint diff --git a/shell/key-bindings.zsh b/shell/key-bindings.zsh index f77e7ec3..35e5f194 100644 --- a/shell/key-bindings.zsh +++ b/shell/key-bindings.zsh @@ -8,7 +8,7 @@ __fsel() { -o -type f -print \ -o -type d -print \ -o -type l -print 2> /dev/null | sed 1d | cut -b3-"}" - eval "$cmd" | $(__fzfcmd) -m | while read item; do + eval "$cmd | $(__fzfcmd) -m $FZF_CTRL_T_OPTS" | while read item; do echo -n "${(q)item} " done echo @@ -29,7 +29,7 @@ bindkey '^T' fzf-file-widget fzf-cd-widget() { local cmd="${FZF_ALT_C_COMMAND:-"command find -L . \\( -path '*/\\.*' -o -fstype 'dev' -o -fstype 'proc' \\) -prune \ -o -type d -print 2> /dev/null | sed 1d | cut -b3-"}" - cd "${$(eval "$cmd" | $(__fzfcmd) +m):-.}" + cd "${$(eval "$cmd | $(__fzfcmd) +m $FZF_ALT_C_OPTS"):-.}" zle reset-prompt } zle -N fzf-cd-widget |