diff options
| author | LangLangBart <92653266+LangLangBart@users.noreply.github.com> | 2024-04-17 11:03:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-17 18:03:12 +0900 |
| commit | d169c951f3abe95ac533864d3ce0515bcb89adce (patch) | |
| tree | 82cf5758422b6bfa407c26c2f3cc248578062768 | |
| parent | 90d7e38909bc704afea96e23acf93ba05ef9f0af (diff) | |
fix: Move 'emulate' command outside interactive check (#3736)
| -rw-r--r-- | shell/completion.zsh | 8 | ||||
| -rw-r--r-- | shell/key-bindings.zsh | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/shell/completion.zsh b/shell/completion.zsh index 7067b06f..3de9fe49 100644 --- a/shell/completion.zsh +++ b/shell/completion.zsh @@ -9,8 +9,6 @@ # - $FZF_COMPLETION_TRIGGER (default: '**') # - $FZF_COMPLETION_OPTS (default: empty) -if [[ -o interactive ]]; then - # Both branches of the following `if` do the same thing -- define # __fzf_completion_options such that `eval $__fzf_completion_options` sets @@ -75,6 +73,9 @@ fi # This brace is the start of try-always block. The `always` part is like # `finally` in lesser languages. We use it to *always* restore user options. { +# The 'emulate' command should not be placed inside the interactive if check; +# placing it there fails to disable alias expansion. See #3731. +if [[ -o interactive ]]; then # To use custom commands instead of find, override _fzf_compgen_{path,dir} # @@ -345,11 +346,10 @@ fzf-completion() { zle -N fzf-completion bindkey '^I' fzf-completion +fi } always { # Restore the original options. eval $__fzf_completion_options 'unset' '__fzf_completion_options' } - -fi diff --git a/shell/key-bindings.zsh b/shell/key-bindings.zsh index a75f4beb..07baa203 100644 --- a/shell/key-bindings.zsh +++ b/shell/key-bindings.zsh @@ -11,8 +11,6 @@ # - $FZF_ALT_C_COMMAND # - $FZF_ALT_C_OPTS -if [[ -o interactive ]]; then - # Key bindings # ------------ @@ -38,6 +36,7 @@ fi 'builtin' 'emulate' 'zsh' && 'builtin' 'setopt' 'no_aliases' { +if [[ -o interactive ]]; then # CTRL-T - Paste the selected file path(s) into the command line __fsel() { @@ -114,10 +113,9 @@ zle -N fzf-history-widget bindkey -M emacs '^R' fzf-history-widget bindkey -M vicmd '^R' fzf-history-widget bindkey -M viins '^R' fzf-history-widget +fi } always { eval $__fzf_key_bindings_options 'unset' '__fzf_key_bindings_options' } - -fi |