mirror of
https://github.com/Llewellynvdm/fzf.git
synced 2024-12-31 14:01:47 +00:00
[shell] Revert interactiveness checks for eval
So that there's no error even when the scripts are mistakenly evaluated
in non-interactive sessions.
bash -c 'eval "$(fzf --bash)"; echo done'
zsh -c 'eval "$(fzf --zsh)"; echo done'
* https://github.com/junegunn/fzf/pull/3675#issuecomment-2044860901
* f103aa4753
This commit is contained in:
parent
4cd37fc02b
commit
152988c17b
@ -9,7 +9,7 @@
|
||||
# - $FZF_COMPLETION_TRIGGER (default: '**')
|
||||
# - $FZF_COMPLETION_OPTS (default: empty)
|
||||
|
||||
[[ $- =~ i ]] || return 0
|
||||
if [[ $- =~ i ]]; then
|
||||
|
||||
|
||||
# To use custom commands instead of find, override _fzf_compgen_{path,dir}
|
||||
@ -581,3 +581,5 @@ _fzf_setup_completion 'var' export unset printenv
|
||||
_fzf_setup_completion 'alias' unalias
|
||||
_fzf_setup_completion 'host' telnet
|
||||
_fzf_setup_completion 'proc' kill
|
||||
|
||||
fi
|
||||
|
@ -9,7 +9,7 @@
|
||||
# - $FZF_COMPLETION_TRIGGER (default: '**')
|
||||
# - $FZF_COMPLETION_OPTS (default: empty)
|
||||
|
||||
[[ -o interactive ]] || return 0
|
||||
if [[ -o interactive ]]; then
|
||||
|
||||
|
||||
# Both branches of the following `if` do the same thing -- define
|
||||
@ -351,3 +351,5 @@ bindkey '^I' fzf-completion
|
||||
eval $__fzf_completion_options
|
||||
'unset' '__fzf_completion_options'
|
||||
}
|
||||
|
||||
fi
|
||||
|
@ -11,7 +11,7 @@
|
||||
# - $FZF_ALT_C_COMMAND
|
||||
# - $FZF_ALT_C_OPTS
|
||||
|
||||
[[ $- =~ i ]] || return 0
|
||||
if [[ $- =~ i ]]; then
|
||||
|
||||
|
||||
# Key bindings
|
||||
@ -132,3 +132,5 @@ if [[ "${FZF_ALT_C_COMMAND-x}" != "" ]]; then
|
||||
bind -m vi-command '"\ec": "\C-z\ec\C-z"'
|
||||
bind -m vi-insert '"\ec": "\C-z\ec\C-z"'
|
||||
fi
|
||||
|
||||
fi
|
||||
|
@ -11,7 +11,7 @@
|
||||
# - $FZF_ALT_C_COMMAND
|
||||
# - $FZF_ALT_C_OPTS
|
||||
|
||||
[[ -o interactive ]] || return 0
|
||||
if [[ -o interactive ]]; then
|
||||
|
||||
|
||||
# Key bindings
|
||||
@ -119,3 +119,5 @@ bindkey -M viins '^R' fzf-history-widget
|
||||
eval $__fzf_key_bindings_options
|
||||
'unset' '__fzf_key_bindings_options'
|
||||
}
|
||||
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user