From 135dd5202fd1f6522b27872d82c720f57a2c3fdf Mon Sep 17 00:00:00 2001
From: Tastaturtaste <31124715+Tastaturtaste@users.noreply.github.com>
Date: Mon, 22 Jan 2024 21:17:45 +0100
Subject: [PATCH] Remove conflicting keybindings added with
 https://github.com/nushell/reedline/pull/689#issue-2057714568, to fix
 https://github.com/nushell/nushell/issues/11600#issue-2092758889 (#715)

---
 src/edit_mode/keybindings.rs | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/edit_mode/keybindings.rs b/src/edit_mode/keybindings.rs
index c3b3a67..70d115d 100644
--- a/src/edit_mode/keybindings.rs
+++ b/src/edit_mode/keybindings.rs
@@ -155,11 +155,6 @@ pub fn add_common_navigation_bindings(kb: &mut Keybindings) {
         KC::Home,
         edit_bind(EC::MoveToLineStart { select: false }),
     );
-    kb.add_binding(
-        KM::CONTROL,
-        KC::Char('a'),
-        edit_bind(EC::MoveToLineStart { select: false }),
-    );
     kb.add_binding(
         KM::NONE,
         KC::End,
@@ -214,10 +209,18 @@ pub fn add_common_edit_bindings(kb: &mut Keybindings) {
     // Base commands should not affect cut buffer
     kb.add_binding(KM::CONTROL, KC::Char('h'), edit_bind(EC::Backspace));
     kb.add_binding(KM::CONTROL, KC::Char('w'), edit_bind(EC::BackspaceWord));
-    kb.add_binding(KM::CONTROL, KC::Char('x'), edit_bind(EC::CutSelection));
-    kb.add_binding(KM::CONTROL, KC::Char('c'), edit_bind(EC::CopySelection));
     kb.add_binding(
-        KM::CONTROL,
+        KM::CONTROL | KM::SHIFT,
+        KC::Char('x'),
+        edit_bind(EC::CutSelection),
+    );
+    kb.add_binding(
+        KM::CONTROL | KM::SHIFT,
+        KC::Char('c'),
+        edit_bind(EC::CopySelection),
+    );
+    kb.add_binding(
+        KM::CONTROL | KM::SHIFT,
         KC::Char('v'),
         edit_bind(EC::PasteCutBufferBefore),
     );
@@ -268,5 +271,9 @@ pub fn add_common_selection_bindings(kb: &mut Keybindings) {
         KC::Home,
         edit_bind(EC::MoveToStart { select: true }),
     );
-    kb.add_binding(KM::CONTROL, KC::Char('a'), edit_bind(EC::SelectAll));
+    kb.add_binding(
+        KM::CONTROL | KM::SHIFT,
+        KC::Char('a'),
+        edit_bind(EC::SelectAll),
+    );
 }