From 6fa09d24e50132b65d1781ff085de8cffcc742df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Mon, 6 Dec 2021 21:20:03 +0100 Subject: [PATCH] =?UTF-8?q?config:=20use=20=E2=80=9C(default)=E2=80=9D=20a?= =?UTF-8?q?s=20path=20in=20log=20message,=20if=20path=20is=20NULL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.c b/config.c index 5265a910..644147c8 100644 --- a/config.c +++ b/config.c @@ -2102,7 +2102,8 @@ resolve_key_binding_collisions(struct config *conf, const char *section_name, LOG_AND_NOTIFY_ERR( "%s:%d: [%s].%s: %s%s: " "modifiers conflict with 'selection-override-modifiers=%s'", - binding1->path, binding1->lineno, section_name, + binding1->path != NULL ? binding1->path : "(default)", + binding1->lineno, section_name, action_map[binding1->action], modifier_names, sym_name, override_names); free(override_names);