From 45efacb448d1858405eb6fba4005083a591502b4 Mon Sep 17 00:00:00 2001 From: Antonio Yang Date: Thu, 25 Feb 2021 21:41:57 +0800 Subject: [PATCH 1/2] Fix default vim style config with notes - fix default vim-style key binding for open editor --- assets/vim_style_key_config.ron | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/assets/vim_style_key_config.ron b/assets/vim_style_key_config.ron index b1939ffcf8..a02318a1a8 100644 --- a/assets/vim_style_key_config.ron +++ b/assets/vim_style_key_config.ron @@ -28,7 +28,9 @@ exit_popup: ( code: Esc, modifiers: ( bits: 0,),), open_commit: ( code: Char('c'), modifiers: ( bits: 0,),), - open_commit_editor: ( code: Char('E'), modifiers: ( bits: 1,),), + + // Note: the shift modifier does not work for open_commit_editor + open_commit_editor: ( code: Char('e'), modifiers: ( bits: 2,),), open_help: ( code: F(1), modifiers: ( bits: 0,),), move_left: ( code: Char('h'), modifiers: ( bits: 0,),), From 3165adf8c0edd1b1b8c657e8a5a6dcafc6bbdb22 Mon Sep 17 00:00:00 2001 From: Antonio Yang Date: Thu, 25 Feb 2021 21:43:32 +0800 Subject: [PATCH 2/2] Fix the display string for status_reset_item key binding --- src/strings.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/strings.rs b/src/strings.rs index 1746279cd1..b854d64b65 100644 --- a/src/strings.rs +++ b/src/strings.rs @@ -545,7 +545,7 @@ pub mod commands { CommandText::new( format!( "Reset Item [{}]", - key_config.get_hint(key_config.stash_drop), + key_config.get_hint(key_config.status_reset_item), ), "revert changes in selected file or entire path", CMD_GROUP_CHANGES,