From 90b1984cbac93a17dc3837503515c23e55a109ea Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Thu, 11 Oct 2012 12:07:43 +0200 Subject: [PATCH] compat: don't forget to copy XKB_MATCH_NONE interpret's Commit a8d462e3669b1790dfad75836d5ec59e390392ef accidentally removed the OR with XKB_MATCH_NONE. It is in fact unused though. Signed-off-by: Ran Benita --- src/xkbcomp/compat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c index d19b9cc..bb64ec8 100644 --- a/src/xkbcomp/compat.c +++ b/src/xkbcomp/compat.c @@ -992,11 +992,11 @@ CopyCompatToKeymap(struct xkb_keymap *keymap, CompatInfo *info) if (!darray_empty(info->interps)) { /* Most specific to least specific. */ CopyInterps(info, true, MATCH_EXACTLY); - CopyInterps(info, true, MATCH_ALL); + CopyInterps(info, true, MATCH_ALL | MATCH_NONE); CopyInterps(info, true, MATCH_ANY); CopyInterps(info, true, MATCH_ANY_OR_NONE); CopyInterps(info, false, MATCH_EXACTLY); - CopyInterps(info, false, MATCH_ALL); + CopyInterps(info, false, MATCH_ALL | MATCH_NONE); CopyInterps(info, false, MATCH_ANY); CopyInterps(info, false, MATCH_ANY_OR_NONE); } -- 2.7.4