frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

This commit is contained in:
Daniel Stone 2006-02-28 16:55:26 +00:00
parent e3b6b95f29
commit 1cfa9f647e
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-02-28 Daniel Stone <daniel@freedesktop.org>
* xkb/maprules.c:
Bug #5216: Allow options to appear with other components.
2006-02-28 Adam Jackson <ajax@freedesktop.org> 2006-02-28 Adam Jackson <ajax@freedesktop.org>
* XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am: * XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am:

7
xkb/maprules.c
View File

@ -378,13 +378,6 @@ Bool found;
remap->num_remap= 0; remap->num_remap= 0;
return; 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))&& if (((present&COMPONENT_MASK)&(1<<KEYMAP))&&
((present&COMPONENT_MASK)!=(1<<KEYMAP))) { ((present&COMPONENT_MASK)!=(1<<KEYMAP))) {
PR_DEBUG("Keymap cannot appear with other components\n"); PR_DEBUG("Keymap cannot appear with other components\n");