From 71e4d5cc5129b912af33b239983545969970ccf4 Mon Sep 17 00:00:00 2001 From: LangLangBart <92653266+LangLangBart@users.noreply.github.com> Date: Thu, 14 Nov 2024 02:38:05 +0100 Subject: [PATCH] revert(zsh): remove 'fc -RI' call in the history widget (#4093) --- shell/key-bindings.zsh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/shell/key-bindings.zsh b/shell/key-bindings.zsh index 3688118..3c17401 100644 --- a/shell/key-bindings.zsh +++ b/shell/key-bindings.zsh @@ -112,16 +112,10 @@ fzf-history-widget() { # as the associative 'history' array, which maps event numbers to full history # lines, are set. Also, make sure Perl is installed for multi-line output. if zmodload -F zsh/parameter p:{commands,history} 2>/dev/null && (( ${+commands[perl]} )); then - # Import commands from other shells if SHARE_HISTORY is enabled, as the - # 'history' array only updates after executing a non-empty command. - selected="$( - if [[ -o sharehistory ]]; then - fc -RI - fi - printf '%s\t%s\000' "${(kv)history[@]}" | - perl -0 -ne 'if (!$seen{(/^\s*[0-9]+\**\t(.*)/s, $1)}++) { s/\n/\n\t/g; print; }' | - FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort --wrap-sign '\t↳ ' --highlight-line ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} +m --read0") \ - FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd))" + selected="$(printf '%s\t%s\000' "${(kv)history[@]}" | + perl -0 -ne 'if (!$seen{(/^\s*[0-9]+\**\t(.*)/s, $1)}++) { s/\n/\n\t/g; print; }' | + FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort --wrap-sign '\t↳ ' --highlight-line ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} +m --read0") \ + FZF_DEFAULT_OPTS_FILE='' $(__fzfcmd))" else selected="$(fc -rl 1 | awk '{ cmd=$0; sub(/^[ \t]*[0-9]+\**[ \t]+/, "", cmd); if (!seen[cmd]++) print $0 }' | FZF_DEFAULT_OPTS=$(__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort --wrap-sign '\t↳ ' --highlight-line ${FZF_CTRL_R_OPTS-} --query=${(qqq)LBUFFER} +m") \