compat: don't forget to copy XKB_MATCH_NONE interpret's
authorRan Benita <ran234@gmail.com>
Thu, 11 Oct 2012 10:07:43 +0000 (12:07 +0200)
committerRan Benita <ran234@gmail.com>
Thu, 11 Oct 2012 10:10:26 +0000 (12:10 +0200)
Commit a8d462e3669b1790dfad75836d5ec59e390392ef accidentally removed the
OR with XKB_MATCH_NONE. It is in fact unused though.

Signed-off-by: Ran Benita <ran234@gmail.com>
src/xkbcomp/compat.c

index d19b9cc..bb64ec8 100644 (file)
@@ -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);
     }