diff options
| author | Tim Oram <dev@mitmaro.ca> | 2022-04-20 09:19:48 -0230 |
|---|---|---|
| committer | Tim Oram <dev@mitmaro.ca> | 2022-04-20 10:03:26 -0230 |
| commit | 5d54e3b145d77ff6c54276183f6e26b0c28817f4 (patch) | |
| tree | 2f52c16122c44f2020fc0342531dcdfc8a724f5a | |
| parent | 3425c5282531f1bca7f571325aafb82ea820d503 (diff) | |
Remove the ctrl-d keybinding
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | readme/customization.md | 5 | ||||
| -rw-r--r-- | src/input/src/event_handler.rs | 8 |
3 files changed, 5 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index edb56cc..61638d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). ### Added - Added mew keybindings for customizing the scrolling the view. ([#647](https://github.com/MitMaro/git-interactive-rebase-tool/pull/647)) +### Removed +- `ctrl-d` keybinding, since it conflicts with the `ctrl-d` keybinding in Vim. ([#648](https://github.com/MitMaro/git-interactive-rebase-tool/pull/648)) + ## [2.1.0] - 2021-04-20 ### Added diff --git a/readme/customization.md b/readme/customization.md index 1ba5228..d006892 100644 --- a/readme/customization.md +++ b/readme/customization.md @@ -170,10 +170,9 @@ A single action can have multiple bindings by providing a whitespace separate li Some key combinations are restricted as they have special meaning. They are: -| Key | Description | -| ------------------ | ----------- | +| Key | Description | +| ------------------ |-----------------------------------------------------------------------------| | `Control+c` | Immediately aborts the program without writing the rebase todo file to disk | -| `Control+d` | Immediately writes the rebase todo file to disk and exits | ## External Editor diff --git a/src/input/src/event_handler.rs b/src/input/src/event_handler.rs index fdf6aa6..a85ebe5 100644 --- a/src/input/src/event_handler.rs +++ b/src/input/src/event_handler.rs @@ -65,10 +65,6 @@ impl<CustomKeybinding: crate::CustomKeybinding, CustomEvent: crate::CustomEvent> code: KeyCode::Char('c'), modifiers: KeyModifiers::CONTROL, }) => Some(Event::from(StandardEvent::Kill)), - Event::Key(KeyEvent { - code: KeyCode::Char('d'), - modifiers: KeyModifiers::CONTROL, - }) => Some(Event::from(StandardEvent::Exit)), _ => None, } } @@ -210,10 +206,6 @@ mod tests { code: KeyCode::Char('c'), modifiers: KeyModifiers::CONTROL, }), Event::from(StandardEvent::Kill))] - #[case::standard(Event::Key(KeyEvent { - code: KeyCode::Char('d'), - modifiers: KeyModifiers::CONTROL, - }), Event::from(StandardEvent::Exit))] #[case::other(Event::from('a'), Event::from(KeyCode::Null))] fn standard_inputs(#[case] event: Event, #[case] expected: Event) { let event_handler = EventHandler::new(create_test_keybindings()); |