From d437bbaa0a100aa1bf6c64980dd773a63cbfdc8e Mon Sep 17 00:00:00 2001 From: justin talbott Date: Fri, 26 Sep 2025 14:13:35 -0400 Subject: [PATCH] Don't let `ctrl-g` clobber git panel keybindings in Emacs keymap (#37732) i'm testing out zed, coming from emacs, and so i'm trying out the base keymap for it. i noticed though that zed's default git keybindings don't work when the gitpanel is open though, because of the top-level binding of `ctrl-g` to cancel. my expectation is that the emacs-like keybindings would work insofar as they don't clobber zed's defaults (which would take precedence), but obviously i'll defer to others on this! another option could be to use the `C-x v` keymap prefix that the emacs built-in `vc` package uses, but it doesn't contain the same set of bindings for git commands that zed has. --- assets/keymaps/macos/emacs.json | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/keymaps/macos/emacs.json b/assets/keymaps/macos/emacs.json index 0f936ba2f9..78e2235965 100755 --- a/assets/keymaps/macos/emacs.json +++ b/assets/keymaps/macos/emacs.json @@ -4,6 +4,7 @@ // from the command palette. [ { + "context": "!GitPanel", "bindings": { "ctrl-g": "menu::Cancel" }