From 13979c101380466fbc278818a480512ff6374f4d Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Sat, 9 May 2020 12:47:53 +0200 Subject: [PATCH] revert workaround (fixes #26) --- src/components/changes.rs | 3 +-- src/keys.rs | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/changes.rs b/src/components/changes.rs index fa8514db..73ff0af3 100644 --- a/src/components/changes.rs +++ b/src/components/changes.rs @@ -348,8 +348,7 @@ impl Component for ChangesComponent { } true } - keys::STATUS_RESET_FILE_1 - | keys::STATUS_RESET_FILE_2 => { + keys::STATUS_RESET_FILE => { self.is_working_dir && self.dispatch_reset_workdir() } diff --git a/src/keys.rs b/src/keys.rs index 61a6d49d..8b665715 100644 --- a/src/keys.rs +++ b/src/keys.rs @@ -30,6 +30,5 @@ pub const MOVE_RIGHT: KeyEvent = no_mod(KeyCode::Right); pub const MOVE_UP: KeyEvent = no_mod(KeyCode::Up); pub const MOVE_DOWN: KeyEvent = no_mod(KeyCode::Down); pub const STATUS_STAGE_FILE: KeyEvent = no_mod(KeyCode::Enter); -pub const STATUS_RESET_FILE_1: KeyEvent = no_mod(KeyCode::Char('D')); -pub const STATUS_RESET_FILE_2: KeyEvent = +pub const STATUS_RESET_FILE: KeyEvent = with_mod(KeyCode::Char('D'), KeyModifiers::SHIFT);