From ea5425f8181644acc3136062ba1b49a558109bb6 Mon Sep 17 00:00:00 2001
From: Smit Barmase <heysmitbarmase@gmail.com>
Date: Fri, 22 Aug 2025 17:54:17 +0530
Subject: [PATCH] editor mode merge

---
 crates/agent_settings/src/agent_settings.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/agent_settings/src/agent_settings.rs b/crates/agent_settings/src/agent_settings.rs
index d4d1cd9dc0cc575ce24177095381752e948a76c5..388f414075b669e3192be735fda79b5eb37b7e6b 100644
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -539,6 +539,7 @@ impl Settings for AgentSettings {
                 &mut settings.use_modifier_to_send,
                 value.use_modifier_to_send,
             );
+            merge(&mut settings.editor_mode, value.editor_mode);
 
             settings
                 .model_parameters