mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-05 18:25:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

vim: Load keymap after base keymap (#24161)

Browse source 
Closes #22562

Release Notes:

- vim: Load vim keymap after a user-configured keymap
This commit is contained in:
Conrad Irwin 2025-02-03 20:25:20 -07:00 committed by GitHub
parent 3d3ac2c470
commit e17f307189
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/zed/src/zed.rs
View file

@ -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) {