Skip to content

Commit b6e1b22

Browse files
authored
feat: Add use-fzf-default-opts (#479)
* Add `use-fzf-default-opts` Ref: #475 0b49f3e introduces a change that makes the plugin ignore `FZF_DEFAULT_OPTS` by default. This commit adds a flag to disable this behavior. Signed-off-by: PrayagS <[email protected]> * Add an additional note for `use-fzf-default-opts` Signed-off-by: PrayagS <[email protected]> --------- Signed-off-by: PrayagS <[email protected]>
1 parent cf57116 commit b6e1b22

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

Diff for: README.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,11 @@ zstyle ':completion:*' menu no
115115
# preview directory's content with eza when completing cd
116116
zstyle ':fzf-tab:complete:cd:*' fzf-preview 'eza -1 --color=always $realpath'
117117
# custom fzf flags
118-
# NOTE: fzf-tab does not follow FZF_DEFAULT_OPTS
118+
# NOTE: fzf-tab does not follow FZF_DEFAULT_OPTS by default
119119
zstyle ':fzf-tab:*' fzf-flags --color=fg:1,fg+:2 --bind=tab:accept
120+
# To make fzf-tab follow FZF_DEFAULT_OPTS.
121+
# NOTE: This may lead to unexpected behavior since some flags break this plugin. See Aloxaf/fzf-tab#455.
122+
zstyle ':fzf-tab:*' use-fzf-default-opts yes
120123
# switch group using `<` and `>`
121124
zstyle ':fzf-tab:*' switch-group '<' '>'
122125
```

Diff for: lib/-ftb-fzf

+7-1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ local ret=0
4040
-ftb-zstyle -a switch-group switch_group || switch_group=(F1 F2)
4141
-ftb-zstyle -s fzf-pad fzf_pad || fzf_pad=2
4242
-ftb-zstyle -s fzf-min-height fzf_min_height || fzf_min_height=0
43+
-ftb-zstyle -b use-fzf-default-opts use_fzf_default_opts || use_fzf_default_opts="no"
4344

4445
-ftb-zstyle -a debug-command debug_command && {
4546
${(eX)debug_command} $fzf_flags
@@ -81,7 +82,12 @@ fi
8182

8283
_ftb_query="${_ftb_query}$(command "$dd" bs=1G count=1 status=none iflag=nonblock < /dev/tty 2>/dev/null)" || true
8384

84-
FZF_DEFAULT_OPTS='' SHELL=$ZSH_NAME $fzf_command \
85+
local fzf_default_opts=''
86+
if [[ "$use_fzf_default_opts" == "yes" ]]; then
87+
fzf_default_opts=$FZF_DEFAULT_OPTS
88+
fi
89+
90+
FZF_DEFAULT_OPTS=$fzf_default_opts SHELL=$ZSH_NAME $fzf_command \
8591
--ansi \
8692
--bind=$binds \
8793
--bind="${switch_group[1]}:reload($reload_command -1),${switch_group[2]}:reload($reload_command 1)" \

0 commit comments

Comments
 (0)