From a297e198668be9fa10698987d39be145b1a0b802 Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Fri, 10 Jan 2025 15:32:24 +0000
Subject: [PATCH] emacs: Fix emacs in embedded terminal on Linux too (#22969)

- Follow-up to #22779 (accidentially did macos only)
- Follow-up to: https://github.com/zed-industries/zed/pull/22590

Release Notes:

- N/A
---
 assets/keymaps/linux/emacs.json | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/assets/keymaps/linux/emacs.json b/assets/keymaps/linux/emacs.json
index fed6f79d47..2060189334 100755
--- a/assets/keymaps/linux/emacs.json
+++ b/assets/keymaps/linux/emacs.json
@@ -55,7 +55,7 @@
     }
   },
   {
-    "context": "Workspace && !Terminal",
+    "context": "Workspace",
     "bindings": {
       "ctrl-x ctrl-c": "zed::Quit", // save-buffers-kill-terminal
       "ctrl-x 5 0": "workspace::CloseWindow", // delete-frame
@@ -72,6 +72,18 @@
       "ctrl-x s": "workspace::SaveAll" // save-some-buffers
     }
   },
+  {
+    // Workaround to enable using emacs in the Zed terminal.
+    // Unbind so Zed ignores these keys and lets emacs handle them.
+    "context": "Terminal",
+    "bindings": {
+      "ctrl-x ctrl-c": null, // save-buffers-kill-terminal
+      "ctrl-x ctrl-f": null, // find-file
+      "ctrl-x ctrl-s": null, // save-buffer
+      "ctrl-x ctrl-w": null, // write-file
+      "ctrl-x s": null // save-some-buffers
+    }
+  },
   {
     "context": "BufferSearchBar > Editor",
     "bindings": {