From c63f25a2bacd277e8db98e34071aea8d84f49185 Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Wed, 26 Aug 2026 23:40:32 +0900 Subject: [PATCH] Document that a command's own key withholds the show key Missed when the check learned about them. Also hyphenate 'comma-separated'. --- README.md | 6 +++--- autoload/fzf/vim.vim | 2 +- doc/fzf-vim.txt | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3f30195..ecdddd5 100644 --- a/README.md +++ b/README.md @@ -108,8 +108,8 @@ Commands `:Rg`, `:Ag`, `:Grep`, `:Lines`, `:BLines`, `:Tags`, `:BTags`, `:Marks`, `:Changes`). Requires fzf 0.74.4 or later, and is not offered in fullscreen mode, with a layout that leaves no other window (`enew`, `tabnew`), on - Windows, or when the key is already used by `g:fzf_vim.paste_key` or - `g:fzf_action` + Windows, or when the key is already used by `g:fzf_vim.paste_key`, + `g:fzf_action`, or the command itself, as `CTRL-ALT-X` is in `:Buffers` - Bang-versions of the commands (e.g. `Ag!`) will open fzf in fullscreen - You can set `g:fzf_vim.command_prefix` to give the same prefix to the commands - e.g. `let g:fzf_vim.command_prefix = 'Fzf'` and you have `FzfFiles`, etc. @@ -188,7 +188,7 @@ was started from and leaves fzf open, so you can look through several entries in one run (see the command list above). It is labelled `Show` in the footer to set it apart from `Enter`, which opens the entry and closes fzf. Customize it with `g:fzf_vim.show_key`, or set it to an empty string to turn the key -off. A comma separated list binds every key in it. It takes the key over from +off. A comma-separated list binds every key in it. It takes the key over from `$FZF_DEFAULT_OPTS`, so pick another key or turn it off to keep a binding of your own. diff --git a/autoload/fzf/vim.vim b/autoload/fzf/vim.vim index 5aab6b5..4c7e322 100755 --- a/autoload/fzf/vim.vim +++ b/autoload/fzf/vim.vim @@ -442,7 +442,7 @@ function! s:show_key() return s:conf('show_key', 'ctrl-o') endfunction -" A key can be a comma separated list, which fzf binds to every key in it. +" A key can be a comma-separated list, which fzf binds to every key in it. " fzf escapes 'alt-,' before splitting on the comma, so do the same. It also " lowercases a key name before matching it, except for 'alt-X' and a bare " character, where it takes the rune as typed, so fold the same ones here and diff --git a/doc/fzf-vim.txt b/doc/fzf-vim.txt index 532d5d9..f3fe730 100644 --- a/doc/fzf-vim.txt +++ b/doc/fzf-vim.txt @@ -161,7 +161,8 @@ COMMANDS *fzf-vim-commands* Grep, Lines, BLines, Tags, BTags, Marks, Changes). Requires fzf 0.74.4 or later, and is not offered in fullscreen mode, with a layout that leaves no other window (enew, tabnew), on Windows, or when the key is already used - by g:fzf_vim.paste_key or g:fzf_action + by g:fzf_vim.paste_key, g:fzf_action, or the command itself, as + CTRL-ALT-X is in :Buffers - Bang-versions of the commands (e.g. `Ag!`) will open fzf in fullscreen - You can set `g:fzf_vim.command_prefix` to give the same prefix to the commands - e.g. `let g:fzf_vim.command_prefix = 'Fzf'` and you have `FzfFiles`, etc. @@ -256,7 +257,7 @@ Most commands support a key that opens the current entry in the window fzf was started from and leaves fzf open, so you can look through several entries in one run. It is labelled Show in the footer to set it apart from Enter, which opens the entry and closes fzf. Customize it with `g:fzf_vim.show_key`, or set -it to an empty string to turn the key off. A comma separated list binds every +it to an empty string to turn the key off. A comma-separated list binds every key in it. It takes the key over from `$FZF_DEFAULT_OPTS`, so pick another key or turn it off to keep a binding of your own. >