diff options
| -rw-r--r-- | book/src/keymap.md | 4 | ||||
| -rw-r--r-- | helix-term/src/keymap.rs | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/book/src/keymap.md b/book/src/keymap.md index aed48d5b..78bac0cf 100644 --- a/book/src/keymap.md +++ b/book/src/keymap.md @@ -38,7 +38,6 @@ | `Z` | Enter sticky [view mode](#view-mode) | N/A | | `Ctrl-w` | Enter [window mode](#window-mode) | N/A | | `Space` | Enter [space mode](#space-mode) | N/A | -| `K` | Show documentation for the item under the cursor | `hover` | ### Changes @@ -98,7 +97,7 @@ | `X` | Extend selection to line bounds (line-wise selection) | `extend_to_line_bounds` | | | Expand selection to parent syntax node TODO: pick a key | `expand_selection` | | `J` | Join lines inside selection | `join_selections` | -| `K` | Keep selections matching the regex TODO: overlapped by hover help | `keep_selections` | +| `K` | Keep selections matching the regex | `keep_selections` | | `$` | Pipe each selection into shell command, keep selections where command returned 0 | `shell_keep_pipe` | | `Ctrl-c` | Comment/uncomment the selections | `toggle_comments` | @@ -194,6 +193,7 @@ This layer is a kludge of mappings, mostly pickers. | Key | Description | Command | | ----- | ----------- | ------- | +| `k` | Show documentation for the item under the cursor | `hover` | | `f` | Open file picker | `file_picker` | | `b` | Open buffer picker | `buffer_picker` | | `s` | Open symbol picker (current document) | `symbol_picker` | diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs index a83b960e..4343a0b6 100644 --- a/helix-term/src/keymap.rs +++ b/helix-term/src/keymap.rs @@ -495,7 +495,6 @@ impl Default for Keymaps { "<" => unindent, "=" => format_selections, "J" => join_selections, - // TODO: conflicts hover/doc "K" => keep_selections, // TODO: and another method for inverse @@ -527,7 +526,6 @@ impl Default for Keymaps { // move under <space>c "C-c" => toggle_comments, - "K" => hover, // z family for save/restore/combine from/to sels from register @@ -553,6 +551,7 @@ impl Default for Keymaps { "P" => paste_clipboard_before, "R" => replace_selections_with_clipboard, "/" => global_search, + "k" => hover, }, "z" => { "View" "z" | "c" => align_view_center, |