diff options
| author | Junegunn Choi <junegunn.c@gmail.com> | 2022-08-08 13:39:37 +0900 |
|---|---|---|
| committer | Junegunn Choi <junegunn.c@gmail.com> | 2022-08-08 23:50:47 +0900 |
| commit | 19f9bbca0d5ae1f64682ab52209c95e38351ece6 (patch) | |
| tree | a0fcc86cb2c0e032b4ec2c7da3b9c1617b8d6e92 | |
| parent | 779d8e16273a9ca776bef4136b3ff1886e10d19a (diff) | |
| download | fzf-19f9bbca0d5ae1f64682ab52209c95e38351ece6.tar.gz | |
Allow specifying fzf options in $FZF_TMUX_OPTS without '--'
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rwxr-xr-x | bin/fzf-tmux | 7 | ||||
| -rw-r--r-- | src/options.go | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 5411bd59..85ed43e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,11 @@ CHANGELOG ```sh fzf-tmux -p70% fzf-tmux -p70% --color=border:bright-red - fzf-tmux -p100%,60% --color=border:bright-yellow --border=horizontal + fzf-tmux -p100%,60% --color=border:bright-yellow --border=horizontal --padding 1,5 --margin 1,0 fzf-tmux -p70%,100% --color=border:bright-green --border=vertical + + # Key bindings (CTRL-T, CTRL-R, ALT-C) will use these options + export FZF_TMUX_OPTS='-p100%,60% --color=border:green --border=horizontal --padding 1,5 --margin 1,0' ``` 0.32.0 diff --git a/bin/fzf-tmux b/bin/fzf-tmux index ff1df5ef..e461fd77 100755 --- a/bin/fzf-tmux +++ b/bin/fzf-tmux @@ -10,7 +10,6 @@ fail() { fzf="$(command -v fzf 2> /dev/null)" || fzf="$(dirname "$0")/fzf" [[ -x "$fzf" ]] || fail 'fzf executable not found' -tmux_args=() args=() opt="" skip="" @@ -119,8 +118,6 @@ while [[ $# -gt 0 ]]; do # "--" can be used to separate fzf-tmux options from fzf options to # avoid conflicts skip=1 - tmux_args=("${args[@]}") - args=() continue ;; *) @@ -212,7 +209,7 @@ if [[ "$opt" =~ "-E" ]]; then cat <&0 > $fifo1 & fi - tmux popup -d "$PWD" "${tmux_args[@]}" $opt "bash $argsf" > /dev/null 2>&1 + tmux popup -d "$PWD" $opt "bash $argsf" > /dev/null 2>&1 exit $? fi @@ -226,7 +223,7 @@ else fi tmux set-window-option synchronize-panes off \;\ set-window-option remain-on-exit off \;\ - split-window -c "$PWD" $opt "${tmux_args[@]}" "bash -c 'exec -a fzf bash $argsf'" $swap \ + split-window -c "$PWD" $opt "bash -c 'exec -a fzf bash $argsf'" $swap \ > /dev/null 2>&1 || { "$fzf" "${args[@]}"; exit $?; } cat $fifo2 exit "$(cat $fifo3)" diff --git a/src/options.go b/src/options.go index 19644ff8..6882eee0 100644 --- a/src/options.go +++ b/src/options.go @@ -1544,6 +1544,8 @@ func parseOptions(opts *Options, allArgs []string) { opts.ClearOnExit = false case "--version": opts.Version = true + case "--": + // Ignored default: if match, value := optString(arg, "--algo="); match { opts.FuzzyAlgo = parseAlgo(value) |