From a10fb8adc0857633be428d673ab8d36d2a90193a Mon Sep 17 00:00:00 2001 From: Kirill Chibisov Date: Sat, 16 Dec 2023 18:50:22 +0400 Subject: [PATCH] Fix the order of `ClearSelection` in Vi mode Fixes #7438. --- alacritty/src/config/bindings.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alacritty/src/config/bindings.rs b/alacritty/src/config/bindings.rs index 36f5f521..b75676a3 100644 --- a/alacritty/src/config/bindings.rs +++ b/alacritty/src/config/bindings.rs @@ -545,12 +545,12 @@ pub fn default_key_bindings() -> Vec { fn common_keybindings() -> Vec { bindings!( KeyBinding; - "c", ModifiersState::CONTROL | ModifiersState::SHIFT, +BindingMode::VI, ~BindingMode::SEARCH; Action::ClearSelection; "v", ModifiersState::CONTROL | ModifiersState::SHIFT, ~BindingMode::VI; Action::Paste; "f", ModifiersState::CONTROL | ModifiersState::SHIFT, ~BindingMode::SEARCH; Action::SearchForward; "b", ModifiersState::CONTROL | ModifiersState::SHIFT, ~BindingMode::SEARCH; Action::SearchBackward; Insert, ModifiersState::SHIFT, ~BindingMode::VI; Action::PasteSelection; "c", ModifiersState::CONTROL | ModifiersState::SHIFT; Action::Copy; + "c", ModifiersState::CONTROL | ModifiersState::SHIFT, +BindingMode::VI, ~BindingMode::SEARCH; Action::ClearSelection; "0", ModifiersState::CONTROL; Action::ResetFontSize; "=", ModifiersState::CONTROL; Action::IncreaseFontSize; "+", ModifiersState::CONTROL; Action::IncreaseFontSize; @@ -579,7 +579,6 @@ pub fn platform_key_bindings() -> Vec { pub fn platform_key_bindings() -> Vec { bindings!( KeyBinding; - "c", ModifiersState::SUPER, +BindingMode::VI, ~BindingMode::SEARCH; Action::ClearSelection; Insert, ModifiersState::SHIFT, ~BindingMode::VI, ~BindingMode::SEARCH; Action::Esc("\x1b[2;2~".into()); // Tabbing api. "t", ModifiersState::SUPER; Action::CreateNewTab; @@ -606,6 +605,7 @@ pub fn platform_key_bindings() -> Vec { "n", ModifiersState::SUPER; Action::CreateNewWindow; "f", ModifiersState::CONTROL | ModifiersState::SUPER; Action::ToggleFullscreen; "c", ModifiersState::SUPER; Action::Copy; + "c", ModifiersState::SUPER, +BindingMode::VI, ~BindingMode::SEARCH; Action::ClearSelection; "h", ModifiersState::SUPER; Action::Hide; "h", ModifiersState::SUPER | ModifiersState::ALT; Action::HideOtherApplications; "m", ModifiersState::SUPER; Action::Minimize;