From f818193b5333eb44da92ce258059906507bd13dc Mon Sep 17 00:00:00 2001
From: Reilly Wood <26268125+rgwood@users.noreply.github.com>
Date: Fri, 13 May 2022 07:26:14 -0700
Subject: [PATCH] Change history menu keybinding from ctrl+x to ctrl+r (#5507)

* Change history menu keybinding to ctrl+r from ctrl+x

* Remove menupage actions from default config

* remove trailing whitespace

* re-add next+previous page keybindings

* Remove hardcoded menu keybindings

* Hardcode new keybindings
---
 crates/nu-cli/src/reedline_config.rs | 12 +++++++-----
 docs/sample_config/default_config.nu | 22 ++++++++++++----------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/crates/nu-cli/src/reedline_config.rs b/crates/nu-cli/src/reedline_config.rs
index c69cc8c54..59a5e1dff 100644
--- a/crates/nu-cli/src/reedline_config.rs
+++ b/crates/nu-cli/src/reedline_config.rs
@@ -501,14 +501,16 @@ fn add_menu_keybindings(keybindings: &mut Keybindings) {
         ReedlineEvent::MenuPrevious,
     );
 
-    // History menu keybinding
+    keybindings.add_binding(
+        KeyModifiers::CONTROL,
+        KeyCode::Char('r'),
+        ReedlineEvent::Menu("history_menu".to_string()),
+    );
+
     keybindings.add_binding(
         KeyModifiers::CONTROL,
         KeyCode::Char('x'),
-        ReedlineEvent::UntilFound(vec![
-            ReedlineEvent::Menu("history_menu".to_string()),
-            ReedlineEvent::MenuPageNext,
-        ]),
+        ReedlineEvent::MenuPageNext,
     );
 
     keybindings.add_binding(
diff --git a/docs/sample_config/default_config.nu b/docs/sample_config/default_config.nu
index 3fd4cf8c6..a00e1c50a 100644
--- a/docs/sample_config/default_config.nu
+++ b/docs/sample_config/default_config.nu
@@ -201,7 +201,7 @@ let-env config = {
   cd_with_abbreviations: false # set to true to allow you to do things like cd s/o/f and nushell expand it to cd some/other/folder
   hooks: {
     pre_prompt: [{
-      $nothing  # replace with source code to run before the prompt is shown 
+      $nothing  # replace with source code to run before the prompt is shown
     }]
     pre_execution: [{
       $nothing  # replace with source code to run before the repl input is run
@@ -349,17 +349,19 @@ let-env config = {
     {
       name: history_menu
       modifier: control
-      keycode: char_x
+      keycode: char_r
       mode: emacs
-      event: {
-        until: [
-          { send: menu name: history_menu }
-          { send: menupagenext }
-        ]
-      }
+      event: { send: menu name: history_menu }
     }
     {
-      name: history_previous
+      name: next_page
+      modifier: control
+      keycode: char_x
+      mode: emacs
+      event: { send: menupagenext }
+    }
+    {
+      name: undo_or_previous_page
       modifier: control
       keycode: char_z
       mode: emacs
@@ -368,7 +370,7 @@ let-env config = {
           { send: menupageprevious }
           { edit: undo }
         ]
-      }
+       }
     }
     # Keybindings used to trigger the user defined menus
     {