From 19f9bbca0d5ae1f64682ab52209c95e38351ece6 Mon Sep 17 00:00:00 2001
From: Junegunn Choi <junegunn.c@gmail.com>
Date: Mon, 8 Aug 2022 13:39:37 +0900
Subject: [PATCH] Allow specifying fzf options in $FZF_TMUX_OPTS without '--'

---
 CHANGELOG.md   | 5 ++++-
 bin/fzf-tmux   | 7 ++-----
 src/options.go | 2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5411bd5..85ed43e 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 ff1df5e..e461fd7 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 19644ff..6882eee 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)