diff options
Diffstat (limited to 'shell/key-bindings.fish')
| -rw-r--r-- | shell/key-bindings.fish | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/shell/key-bindings.fish b/shell/key-bindings.fish index 8e316518..73e00b23 100644 --- a/shell/key-bindings.fish +++ b/shell/key-bindings.fish @@ -17,12 +17,13 @@ function fzf_key_bindings function __fzf_defaults - # $1: Prepend to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS - # $2: Append to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS - test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40% - echo "--height $FZF_TMUX_HEIGHT --min-height 20+ --bind=ctrl-z:ignore" $argv[1] - test -r "$FZF_DEFAULT_OPTS_FILE"; and string collect -N -- <$FZF_DEFAULT_OPTS_FILE - echo $FZF_DEFAULT_OPTS $argv[2] + # $argv[1]: Prepend to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS + # $argv[2..]: Append to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS + test -n "$FZF_TMUX_HEIGHT"; or set -l FZF_TMUX_HEIGHT 40% + string join ' ' -- \ + "--height $FZF_TMUX_HEIGHT --min-height=20+ --bind=ctrl-z:ignore" $argv[1] \ + (test -r "$FZF_DEFAULT_OPTS_FILE"; and string join -- ' ' <$FZF_DEFAULT_OPTS_FILE) \ + $FZF_DEFAULT_OPTS $argv[2..-1] end # Store current token in $dir as root for the 'find' command |