fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-05 00:38:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug #5216: Allow options to appear with other components.

Browse source
This commit is contained in:
Adam Jackson 2006-02-28 18:11:58 +00:00
parent 83c579c97b
commit 8928e9e097
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -8,6 +8,9 @@
* randr/Makefile.am:
Sync with head, install randrstr.h in the SDK.
* xkb/maprules.c:
Bug #5216: Allow options to appear with other components.
2006-02-15 Eric Anholt <anholt@FreeBSD.org>
* include/dix-config.h.in:

7
xkb/maprules.c
View file

@ -378,13 +378,6 @@ Bool found;
remap->num_remap= 0;
return;
}
if (((present&PART_MASK)&(1<<OPTION))&&
((present&PART_MASK)!=(1<<OPTION))) {
PR_DEBUG("Options cannot appear with other parts\n");
PR_DEBUG("Illegal mapping ignored\n");
remap->num_remap= 0;
return;
}
if (((present&COMPONENT_MASK)&(1<<KEYMAP))&&
((present&COMPONENT_MASK)!=(1<<KEYMAP))) {
PR_DEBUG("Keymap cannot appear with other components\n");