Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix accidental load of default keymap *after* loading user keymap

Browse source 
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Marshall <marshall@zed.dev>
This commit is contained in:
Max Brunsfeld 2024-01-04 15:31:00 -08:00
parent 783256c80e
commit ad20bc39c5
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -400,7 +400,6 @@ pub fn initialize_workspace(app_state: Arc<AppState>, cx: &mut AppContext) {
}); });
workspace.focus_handle(cx).focus(cx); workspace.focus_handle(cx).focus(cx);
load_default_keymap(cx);
}) })
.detach(); .detach();
} }
@ -571,6 +570,8 @@ pub fn handle_keymap_file_changes(
}) })
.detach(); .detach();
load_default_keymap(cx);
cx.spawn(move |cx| async move { cx.spawn(move |cx| async move {
let mut user_keymap = KeymapFile::default(); let mut user_keymap = KeymapFile::default();
loop { loop {