Skip to content

Commit 176cfcd

Browse files
Revert "Resolve conflicts between prompt/picker bindings (helix-editor#1792)"
This reverts commit 5d61631.
1 parent 37fe42d commit 176cfcd

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

book/src/keymap.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,8 +457,8 @@ See the documentation page on [pickers](./pickers.md) for more info.
457457

458458
| Key | Description |
459459
| ----- | ------------- |
460-
| `Shift-Tab`, `Up`, `Ctrl-p` | Previous entry |
461-
| `Tab`, `Down`, `Ctrl-n` | Next entry |
460+
| `Shift-Tab`, `Up`, `Ctrl-p`, `Ctrl-k` | Previous entry |
461+
| `Tab`, `Down`, `Ctrl-n`, `Ctrl-j` | Next entry |
462462
| `PageUp`, `Ctrl-u` | Page up |
463463
| `PageDown`, `Ctrl-d` | Page down |
464464
| `Home` | Go to first entry |

helix-term/src/ui/picker.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,16 +1069,16 @@ impl<I: 'static + Send + Sync, D: 'static + Send + Sync> Component for Picker<I,
10691069
};
10701070

10711071
match key_event {
1072-
shift!(Tab) | key!(Up) | ctrl!('p') => {
1072+
shift!(Tab) | key!(Up) | ctrl!('p') | ctrl!('k') => {
10731073
self.move_by(1, Direction::Backward);
10741074
}
1075-
key!(Tab) | key!(Down) | ctrl!('n') => {
1075+
key!(Tab) | key!(Down) | ctrl!('n') | ctrl!('j') => {
10761076
self.move_by(1, Direction::Forward);
10771077
}
1078-
key!(PageDown) | ctrl!('d') => {
1078+
key!(PageDown) | ctrl!('f') => {
10791079
self.page_down();
10801080
}
1081-
key!(PageUp) | ctrl!('u') => {
1081+
key!(PageUp) | ctrl!('b') => {
10821082
self.page_up();
10831083
}
10841084
key!(Home) => {

0 commit comments

Comments
 (0)