From 8fc82e875129d5260a8185e244c6e3684e0e444b Mon Sep 17 00:00:00 2001 From: etcusrvar Date: Tue, 9 Feb 2021 21:39:51 -0600 Subject: [PATCH 1/3] fix: make FZF_DEFAULT_OPTS global --- conf.d/fzf.fish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.d/fzf.fish b/conf.d/fzf.fish index ee492601..5dd7f8c2 100644 --- a/conf.d/fzf.fish +++ b/conf.d/fzf.fish @@ -33,7 +33,7 @@ if not set --query FZF_DEFAULT_OPTS # height=90% leaves space to see the current command and some scrollback, maintaining context of work # preview-window=wrap wraps long lines in the preview window, making reading easier # marker=* makes the multi-select marker more distinguishable from the pointer (since both default to >) - set --export FZF_DEFAULT_OPTS '--cycle --layout=reverse --border --height=90% --preview-window=wrap --marker="*"' + set --global --export FZF_DEFAULT_OPTS '--cycle --layout=reverse --border --height=90% --preview-window=wrap --marker="*"' end function _fzf_uninstall --on-event fzf_uninstall From 3a44617092424a6712c2e8fceb994acb2519fe5a Mon Sep 17 00:00:00 2001 From: Patrick Date: Wed, 10 Feb 2021 08:17:42 -0800 Subject: [PATCH 2/3] make __fzf_search_vars_cmd explicitly global as well --- conf.d/fzf.fish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf.d/fzf.fish b/conf.d/fzf.fish index 5dd7f8c2..e1a0699d 100644 --- a/conf.d/fzf.fish +++ b/conf.d/fzf.fish @@ -2,7 +2,7 @@ # them before even executing __fzf_search_shell_variables. We use psub to store the # variables' info in temporary files and pass in the filenames as arguments. # This variable is intentionally global so that it can be referenced by custom key bindings and tests -set __fzf_search_vars_cmd '__fzf_search_shell_variables (set --show | psub) (set --names | psub)' +set --global __fzf_search_vars_cmd '__fzf_search_shell_variables (set --show | psub) (set --names | psub)' # Set up the default, mnemonic key bindings unless the user has chosen to customize them if not set --query fzf_fish_custom_keybindings From 4f8098919f059e7d0b896e4b37407b52bd2767bf Mon Sep 17 00:00:00 2001 From: Patrick Date: Wed, 10 Feb 2021 08:19:12 -0800 Subject: [PATCH 3/3] set --erase __fzf_search_vars_cmd --- conf.d/fzf.fish | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf.d/fzf.fish b/conf.d/fzf.fish index e1a0699d..830f44a3 100644 --- a/conf.d/fzf.fish +++ b/conf.d/fzf.fish @@ -49,5 +49,7 @@ function _fzf_uninstall --on-event fzf_uninstall echo "fzf.fish key bindings removed" set_color normal end + + set --erase __fzf_search_vars_cmd functions --erase _fzf_uninstall end