From 5dbeb5ce274df5649b2e475a7b181c03c26b38b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Mon, 5 Apr 2021 14:33:44 +0200
Subject: [PATCH] config: parse_key_binding_section(): use provided action-map
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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”.
---
 CHANGELOG.md | 2 ++
 config.c     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16b5f9c3..970c070b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,8 @@
 * Crash caused by a double free originating in `XTSMGRAPHICS` - set
   number of color registers
   (https://codeberg.org/dnkl/foot/issues/427).
+* Wrong action referenced in error message for key binding collisions
+  (https://codeberg.org/dnkl/foot/issues/432).
 
 
 ### Security
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);