>From 36869b0a1e22e2cced58adc6739d6eef2ecb6729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?= Date: Fri, 20 Nov 2020 11:38:16 +0100 Subject: [PATCH 3/3] format-lisp, format-scheme: Compare intersection to both specs. * gettext-tools/src/format-lisp.c (format_check): Compare to spec1 list. * gettext-tools/src/format-scheme.c (format_check): Likewise. --- gettext-tools/src/format-lisp.c | 3 ++- gettext-tools/src/format-scheme.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gettext-tools/src/format-lisp.c b/gettext-tools/src/format-lisp.c index 94194dbef..6840f93ac 100644 --- a/gettext-tools/src/format-lisp.c +++ b/gettext-tools/src/format-lisp.c @@ -3487,7 +3487,8 @@ format_check (void *msgid_descr, void *msgstr_descr, bool equality, if (!(intersection != NULL && (normalize_list (intersection), - equal_list (intersection, spec2->list)))) + equal_list (intersection, spec2->list) + || equal_list (intesection, spec1->list)))) { if (error_logger) error_logger (_("format specifications in '%s' are not a subset of those in '%s'"), diff --git a/gettext-tools/src/format-scheme.c b/gettext-tools/src/format-scheme.c index 9958a475e..2e95b924f 100644 --- a/gettext-tools/src/format-scheme.c +++ b/gettext-tools/src/format-scheme.c @@ -3409,7 +3409,8 @@ format_check (void *msgid_descr, void *msgstr_descr, bool equality, if (!(intersection != NULL && (normalize_list (intersection), - equal_list (intersection, spec2->list)))) + equal_list (intersection, spec2->list) + || equal_list (intersection, spec1->list)))) { if (error_logger) error_logger (_("format specifications in '%s' are not a subset of those in '%s'"), -- 2.29.2