skipped 57 lines 58 58 ;; 59 59 -p*|-w*|-h*|-x*|-y*|-d*|-u*|-r*|-l*) 60 60 if [[ "$arg" =~ ^-[pwhxy] ]]; then 61 - [[ "$opt" =~ "-K - E" ]] || opt="- K -E" 61 + [[ "$opt" =~ "-E" ]] || opt="-E" 62 62 elif [[ "$arg" =~ ^.[lr] ]]; then 63 63 opt="-h" 64 64 if [[ "$arg" =~ ^.l ]]; then skipped 74 lines 139 139 args=("${args[@]}" "--no-height" "--bind=ctrl-z:ignore") 140 140 141 141 # Handle zoomed tmux pane without popup options by moving it to a temp window 142 - if [[ ! "$opt" =~ "-K - E" ]] && tmux list-panes -F '#F' | grep -q Z; then 142 + if [[ ! "$opt" =~ "-E" ]] && tmux list-panes -F '#F' | grep -q Z; then 143 143 zoomed_without_popup=1 144 144 original_window=$(tmux display-message -p "#{window_id}") 145 145 tmp_window=$(tmux new-window -d -P -F "#{window_id}" "bash -c 'while :; do for c in \\| / - '\\;' do sleep 0.2; printf \"\\r\$c fzf-tmux is running\\r\"; done; done'") skipped 35 lines 181 181 trap 'cleanup' EXIT 182 182 183 183 envs="export TERM=$TERM " 184 - [[ "$opt" =~ "-K - E" ]] && FZF_DEFAULT_OPTS="--margin 0,1 $FZF_DEFAULT_OPTS" 184 + [[ "$opt" =~ "-E" ]] && FZF_DEFAULT_OPTS="--margin 0,1 $FZF_DEFAULT_OPTS" 185 185 [[ -n "$FZF_DEFAULT_OPTS" ]] && envs="$envs FZF_DEFAULT_OPTS=$(printf %q "$FZF_DEFAULT_OPTS")" 186 186 [[ -n "$FZF_DEFAULT_COMMAND" ]] && envs="$envs FZF_DEFAULT_COMMAND=$(printf %q "$FZF_DEFAULT_COMMAND")" 187 187 echo "$envs;" > "$argsf" skipped 7 lines 195 195 196 196 export TMUX=$(cut -d , -f 1,2 <<< "$TMUX") 197 197 mkfifo -m o+w $fifo2 198 - if [[ "$opt" =~ "-K - E" ]]; then 198 + if [[ "$opt" =~ "-E" ]]; then 199 199 cat $fifo2 & 200 200 if [[ -n "$term" ]] || [[ -t 0 ]]; then 201 201 cat <<< "\"$fzf\" $opts > $fifo2; out=\$? $close; exit \$out" >> $argsf skipped 1 lines 203 203 mkfifo $fifo1 204 204 cat <<< "\"$fzf\" $opts < $fifo1 > $fifo2; out=\$? $close; exit \$out" >> $argsf 205 205 cat <&0 > $fifo1 & 206 - fi 207 - 208 - # tmux dropped the support for `-K`, `-R` to popup command 209 - # TODO: We can remove this once tmux 3.2 is released 210 - if [[ ! "$(tmux popup --help 2>&1)" =~ '-R shell-command' ]]; then 211 - opt="${opt/-K/}" 212 - else 213 - opt="${opt} -R" 214 206 fi 215 207 216 208 tmux popup -d "$PWD" "${tmux_args[@]}" $opt "bash $argsf" > /dev/null 2>&1 skipped 18 lines