aboutsummaryrefslogtreecommitdiff
path: root/helix-term/src/keymap.rs
diff options
context:
space:
mode:
authorJJ2023-11-01 01:19:02 +0000
committerJJ2023-11-01 04:08:47 +0000
commit7260812a720336111dc4643c9852e34820745338 (patch)
treed8398e3779b4aaad3c6cc749673a1b55ef44df7f /helix-term/src/keymap.rs
parent368995b51f2b0b8574a87ebe04749cb556b4c538 (diff)
Add unbind-default-keys config option
ref: https://github.com/helix-editor/helix/issues/2720 ref: https://github.com/helix-editor/helix/pull/2733 Co-authored-by: Linden Krouse <ztaticnull@gmail.com>
Diffstat (limited to 'helix-term/src/keymap.rs')
-rw-r--r--helix-term/src/keymap.rs7
1 files changed, 5 insertions, 2 deletions
diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index 598be55b..c5d188d5 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -309,7 +309,10 @@ impl Keymaps {
pub fn get(&mut self, mode: Mode, key: KeyEvent) -> KeymapResult {
// TODO: remove the sticky part and look up manually
let keymaps = &*self.map();
- let keymap = &keymaps[&mode];
+ let keymap = match keymaps.get(&mode) {
+ Some(keymap) => keymap,
+ None => return KeymapResult::NotFound,
+ };
if key!(Esc) == key {
if !self.state.is_empty() {
@@ -364,7 +367,7 @@ impl Default for Keymaps {
}
}
-/// Merge default config keys with user overwritten keys for custom user config.
+/// Merge existing config keys with user overwritten keys.
pub fn merge_keys(dst: &mut HashMap<Mode, KeyTrie>, mut delta: HashMap<Mode, KeyTrie>) {
for (mode, keys) in dst {
keys.merge_nodes(