From e17f3071899e7a439f43638a84142cb55a732ea7 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 3 Feb 2025 20:25:20 -0700
Subject: [PATCH] vim: Load keymap after base keymap (#24161)

Closes #22562

Release Notes:

- vim: Load vim keymap after a user-configured keymap
---
 crates/zed/src/zed.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index 9e0c92f189..3daa543855 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -1239,13 +1239,14 @@ pub fn load_default_keymap(cx: &mut App) {
     }
 
     cx.bind_keys(KeymapFile::load_asset(DEFAULT_KEYMAP_PATH, cx).unwrap());
-    if VimModeSetting::get_global(cx).0 {
-        cx.bind_keys(KeymapFile::load_asset(VIM_KEYMAP_PATH, cx).unwrap());
-    }
 
     if let Some(asset_path) = base_keymap.asset_path() {
         cx.bind_keys(KeymapFile::load_asset(asset_path, cx).unwrap());
     }
+
+    if VimModeSetting::get_global(cx).0 {
+        cx.bind_keys(KeymapFile::load_asset(VIM_KEYMAP_PATH, cx).unwrap());
+    }
 }
 
 pub fn handle_settings_changed(error: Option<anyhow::Error>, cx: &mut App) {