summaryrefslogtreecommitdiff
path: root/src/commands.cc
diff options
context:
space:
mode:
authorJohannes Altmanninger <aclopte@gmail.com>2023-06-24 19:49:02 +0200
committerJohannes Altmanninger <aclopte@gmail.com>2023-07-20 09:18:23 +0200
commit12310418b0a577fc0b60f0aae60503462073eb75 (patch)
tree7414d018f82c65dff626df1d18c51dcb4015f7d0 /src/commands.cc
parente3122ab2c19248b590cb0143610439ec050766b7 (diff)
Allow map/unmap during mapping execution
Commits e49c0fb04 (unmap: fail if the mapping is currently executing, 2023-05-14) 42be0057a (map: fail if key is currently executing, 2023-06-24) fixed potential use-after-free issues. By doing so, it broke configurations that in practice have not triggered any crashes [1] [2]. For example with, set -remove global autocomplete insert hook global InsertCompletionShow .* %{ map window insert <esc> <c-o> } hook global InsertCompletionHide .* %{ unmap window insert <esc> <c-o> } The execution of the <esc> mapping triggers InsertCompletionHide fails at unmapping. This seems legit and I don't see an obvious alternative way to write it (InsertIdle would not be correct though it would work in practice). Fix the regression by allowing map and unmap again while keeping the mappings alive until they have finished executing. Applying map/unmap immediately seems like the most obvious semantics. Alternatively, we could apply them in between key presses. [1]: <https://github.com/kak-lsp/kak-lsp/issues/689> [2]: <https://github.com/alexherbo2/auto-pairs.kak/issues/60>
Diffstat (limited to 'src/commands.cc')
-rw-r--r--src/commands.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/commands.cc b/src/commands.cc
index 446ecd29..519d040c 100644
--- a/src/commands.cc
+++ b/src/commands.cc
@@ -1935,7 +1935,7 @@ const CommandDesc unmap_key_cmd = {
if (keymaps.is_mapped(key[0], keymap_mode) and
(parser.positional_count() < 4 or
- keymaps.get_mapping_keys(key[0], keymap_mode) == ConstArrayView<Key>{parse_keys(parser[3])}))
+ keymaps.get_mapping_keys(key[0], keymap_mode) == parse_keys(parser[3])))
keymaps.unmap_key(key[0], keymap_mode);
}
};