Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

git_ui: Fix Enter key selecting branch in commit modal branch picker (#58366)

saberoueslati5791ebc2b041
diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 5fa5c4f5759..29988d2c292 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -1011,7 +1011,7 @@
},
},
{
- "context": "GitCommit > Editor",
+ "context": "GitCommit > Editor && mode == auto_height",
"bindings": {
"escape": "menu::Cancel",
"enter": "editor::Newline",
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 79b7263639b..a14cc04fe2f 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -1117,7 +1117,7 @@
},
},
{
- "context": "GitCommit > Editor",
+ "context": "GitCommit > Editor && mode == auto_height",
"use_key_equivalents": true,
"bindings": {
"enter": "editor::Newline",
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index 1a16a7cc27c..3d926a67693 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -1003,7 +1003,7 @@
},
},
{
- "context": "GitCommit > Editor",
+ "context": "GitCommit > Editor && mode == auto_height",
"use_key_equivalents": true,
"bindings": {
"escape": "menu::Cancel",