From 56424eb1aa70673b1983cad3949fa91c7bab3e1a Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sun, 19 Feb 2023 13:13:28 +1100
Subject: remove x keybinding for opening menu so we now only use '?'

---
 pkg/config/user_config.go |  2 +-
 pkg/gui/keybindings.go    | 14 ++++++++------
 pkg/gui/view_helpers.go   |  6 +++---
 3 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'pkg')

diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go
index 6fe880ce2..a4fc71579 100644
--- a/pkg/config/user_config.go
+++ b/pkg/config/user_config.go
@@ -450,7 +450,7 @@ func GetDefaultConfig() *UserConfig {
 				NextMatch:                    "n",
 				PrevMatch:                    "N",
 				StartSearch:                  "/",
-				OptionMenu:                   "x",
+				OptionMenu:                   "",
 				OptionMenuAlt1:               "?",
 				Select:                       "<space>",
 				GoInto:                       "<enter>",
diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go
index 35623b847..291c92288 100644
--- a/pkg/gui/keybindings.go
+++ b/pkg/gui/keybindings.go
@@ -145,17 +145,19 @@ func (self *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBi
 			Description: self.c.Tr.LcRefresh,
 		},
 		{
-			ViewName:    "",
-			Key:         opts.GetKey(opts.Config.Universal.OptionMenu),
-			Handler:     self.handleCreateOptionsMenu,
-			Description: self.c.Tr.LcOpenMenu,
-			OpensMenu:   true,
+			ViewName:  "",
+			Key:       opts.GetKey(opts.Config.Universal.OptionMenu),
+			Handler:   self.handleCreateOptionsMenu,
+			OpensMenu: true,
 		},
 		{
 			ViewName: "",
 			Key:      opts.GetKey(opts.Config.Universal.OptionMenuAlt1),
 			Modifier: gocui.ModNone,
-			Handler:  self.handleCreateOptionsMenu,
+			// we have the description on the alt key and not the main key for legacy reasons
+			// (the original main key was 'x' but we've reassigned that to other purposes)
+			Description: self.c.Tr.LcOpenMenu,
+			Handler:     self.handleCreateOptionsMenu,
 		},
 		{
 			ViewName:    "status",
diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go
index db4fe476d..c51942b03 100644
--- a/pkg/gui/view_helpers.go
+++ b/pkg/gui/view_helpers.go
@@ -107,9 +107,9 @@ func (gui *Gui) globalOptionsMap() map[string]string {
 	return map[string]string{
 		fmt.Sprintf("%s/%s", keybindings.Label(keybindingConfig.Universal.ScrollUpMain), keybindings.Label(keybindingConfig.Universal.ScrollDownMain)):                                                                                                               gui.c.Tr.LcScroll,
 		fmt.Sprintf("%s %s %s %s", keybindings.Label(keybindingConfig.Universal.PrevBlock), keybindings.Label(keybindingConfig.Universal.NextBlock), keybindings.Label(keybindingConfig.Universal.PrevItem), keybindings.Label(keybindingConfig.Universal.NextItem)): gui.c.Tr.LcNavigate,
-		keybindings.Label(keybindingConfig.Universal.Return):     gui.c.Tr.LcCancel,
-		keybindings.Label(keybindingConfig.Universal.Quit):       gui.c.Tr.LcQuit,
-		keybindings.Label(keybindingConfig.Universal.OptionMenu): gui.c.Tr.LcMenu,
+		keybindings.Label(keybindingConfig.Universal.Return):         gui.c.Tr.LcCancel,
+		keybindings.Label(keybindingConfig.Universal.Quit):           gui.c.Tr.LcQuit,
+		keybindings.Label(keybindingConfig.Universal.OptionMenuAlt1): gui.c.Tr.LcMenu,
 		fmt.Sprintf("%s-%s", keybindings.Label(keybindingConfig.Universal.JumpToBlock[0]), keybindings.Label(keybindingConfig.Universal.JumpToBlock[len(keybindingConfig.Universal.JumpToBlock)-1])): gui.c.Tr.LcJump,
 		fmt.Sprintf("%s/%s", keybindings.Label(keybindingConfig.Universal.ScrollLeft), keybindings.Label(keybindingConfig.Universal.ScrollRight)):                                                    gui.c.Tr.LcScrollLeftRight,
 	}
-- 
cgit v1.2.3