From 21fd5c24bf067a2ee547cabf746ce3429e81074b Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Sun, 22 Jun 2025 15:02:25 -0400
Subject: [PATCH] emacs: Fix ctrl-p/ctrl-n navigating popover menus (#33218)

Closes https://github.com/zed-industries/zed/issues/33200

Release Notes:

- emacs: Fixed ctrl-p/ctrl-n keyboard navigation of autocomplete/code
actions menus
---
 assets/keymaps/linux/emacs.json | 7 +++++++
 assets/keymaps/macos/emacs.json | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/assets/keymaps/linux/emacs.json b/assets/keymaps/linux/emacs.json
index 5a5cb6d90c..d1453da485 100755
--- a/assets/keymaps/linux/emacs.json
+++ b/assets/keymaps/linux/emacs.json
@@ -90,6 +90,13 @@
       "ctrl-g": "editor::Cancel"
     }
   },
+  {
+    "context": "Editor && (showing_code_actions || showing_completions)",
+    "bindings": {
+      "ctrl-p": "editor::ContextMenuPrevious",
+      "ctrl-n": "editor::ContextMenuNext"
+    }
+  },
   {
     "context": "Workspace",
     "bindings": {
diff --git a/assets/keymaps/macos/emacs.json b/assets/keymaps/macos/emacs.json
index 5a5cb6d90c..d1453da485 100755
--- a/assets/keymaps/macos/emacs.json
+++ b/assets/keymaps/macos/emacs.json
@@ -90,6 +90,13 @@
       "ctrl-g": "editor::Cancel"
     }
   },
+  {
+    "context": "Editor && (showing_code_actions || showing_completions)",
+    "bindings": {
+      "ctrl-p": "editor::ContextMenuPrevious",
+      "ctrl-n": "editor::ContextMenuNext"
+    }
+  },
   {
     "context": "Workspace",
     "bindings": {