5d61631 · helix · git.iko.soy

on master help sign in

Resolve conflicts between prompt/picker bindings (#1792)

5d61631Rohan Jain5 years ago

book/src/keymap.md+4−4

@@ -331,10 +331,10 @@ Keys to use within picker. Remapping currently not supported.

331

332| Key | Description |

333| ----- | ------------- |

334−| `Up`, `Ctrl-k`, `Ctrl-p` | Previous entry |

334+| `Up`, `Ctrl-p` | Previous entry |

335−| `PageUp`, `Ctrl-b` | Page up |

335+| `PageUp`, `Ctrl-u` | Page up |

336−| `Down`, `Ctrl-j`, `Ctrl-n` | Next entry |

336+| `Down`, `Ctrl-n` | Next entry |

337−| `PageDown`, `Ctrl-f` | Page down |

337+| `PageDown`, `Ctrl-d` | Page down |

338| `Home` | Go to first entry |

339| `End` | Go to last entry |

340| `Ctrl-space` | Filter options |

helix-term/src/ui/picker.rs+4−4

@@ -498,16 +498,16 @@ impl<T: 'static> Component for Picker<T> {

498 })));

499

500 match key_event.into() {

501− shift!(Tab) | key!(Up) | ctrl!('p') | ctrl!('k') => {

501+ shift!(Tab) | key!(Up) | ctrl!('p') => {

502 self.move_by(1, Direction::Backward);

503 }

504− key!(Tab) | key!(Down) | ctrl!('n') | ctrl!('j') => {

504+ key!(Tab) | key!(Down) | ctrl!('n') => {

505 self.move_by(1, Direction::Forward);

506 }

507− key!(PageDown) | ctrl!('f') => {

507+ key!(PageDown) | ctrl!('d') => {

508 self.page_down();

509 }

510− key!(PageUp) | ctrl!('b') => {

510+ key!(PageUp) | ctrl!('u') => {

511 self.page_up();

512 }

513 key!(Home) => {