aboutsummaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-04-05 12:33:44 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-04-05 12:36:22 +0000
commit285e3c4aa27f6454e87d29a8d89ab7f7452796a1 (patch)
tree928769509a95deea8ddb3c0004fef73a694d7acf /config.c
parentMerge branch 'sixel-fix-double-free-in-set-palette-size' (diff)
config: parse_key_binding_section(): use provided action-map
Don’t call has_key_binding_collisions() with ‘binding_action_map’ unconditionally; use the provided ‘action_map’ instead. This fixes wrong error messages for key combo collisions in key binding sections other than the regular “key-bindings”.
Diffstat (limited to 'config.c')
-rw-r--r--config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/config.c b/config.c
index ab0236bb..0112b9e4 100644
--- a/config.c
+++ b/config.c
@@ -1393,7 +1393,7 @@ parse_key_binding_section(
if (!parse_key_combos(
conf, value, &key_combos, section, key, path, lineno) ||
has_key_binding_collisions(
- conf, action, binding_action_map, bindings, &key_combos,
+ conf, action, action_map, bindings, &key_combos,
path, lineno))
{
free(pipe_argv);