From d7471e2eca026715094ac4538cfd496f4b8bfb8a Mon Sep 17 00:00:00 2001 From: rootiest Date: Mon, 18 May 2026 20:50:48 -0400 Subject: [PATCH] fix(fzf): fall back to plain wrap on older fzf lacking wrap-word MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit wrap-word in --preview-window was added alongside bg-transform. Reuse the existing _fzf_transform_action variable (already inherited by fzf-history-widget) to select wrap-word on newer fzf and plain wrap on older builds — no additional version check needed. --- integrations/fzf.fish | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/integrations/fzf.fish b/integrations/fzf.fish index b1a2c1a..f376650 100644 --- a/integrations/fzf.fish +++ b/integrations/fzf.fish @@ -213,10 +213,13 @@ function fzf_key_bindings end # Prepend the options to allow user customizations + # wrap-word requires the same newer fzf as bg-transform; fall back to plain wrap + set -l _fzf_wrap_opt wrap + test "$_fzf_transform_action" = bg-transform; and set _fzf_wrap_opt wrap-word set -p -- FZF_DEFAULT_OPTS \ '--bind="focus,resize:'$_fzf_transform_action':if test \\"$FZF_COLUMNS\\" -gt 100 -a \\\\( \\"$FZF_SELECT_COUNT\\" -gt 0 -o \\\\( -z \\"$FZF_WRAP\\" -a (string length -- {}) -gt (math $FZF_COLUMNS - 4) \\\\) -o (string collect -- {2..} | fish_indent | count) -gt 1 \\\\); echo show-preview; else echo hide-preview; end"' \ '--preview="string collect -- (test \\"$FZF_SELECT_COUNT\\" -gt 0; and string collect -- {+2..}) \\"\\n# \\"'$date_cmd' {2..} | fish_indent --ansi"' \ - '--preview-window="right,50%,wrap-word,follow,info,hidden"' + '--preview-window="right,50%,'$_fzf_wrap_opt',follow,info,hidden"' end set -lx FZF_DEFAULT_OPTS_FILE