xkbcomp: Changes to 'master'

[Peter Hutterer]

 keycodes.c |   25 +++++++++++--------------
 symbols.c  |   11 +++++++++--
 2 files changed, 20 insertions(+), 16 deletions(-)

New commits:
commit 36fecff588199a3a6c007f09ff709f3148d40f77
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date:   Tue Aug 19 16:33:03 2008 +0930

    Don't overwrite previously assigned type indices with useless ones.
    
    The default type for a key with no levels is ONE_LEVEL.
    Let's not overwrite the kt_index with this default type if we have previously
    assigned a real type.
    
    Reproduceable by running setxkbmap -layout "ru(phonetic),us", the first group
    is assigned ONE_LEVEL and shift stops working.
    
    Red Hat Bug #436626 <https://bugzilla.redhat.com/show_bug.cgi?id=436626>

commit d0dfd26e81aef53e9adf5fd6372d69e2ac7a8f9c
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date:   Tue Aug 19 14:36:13 2008 +0930

    Remove unused merge parameter from HandleKeyNameVar.

commit 391ea45b2cadc7faeb6acb5d9ec7b405d67d46fd
Author: Peter Hutterer <peter.hutterer at redhat.com>
Date:   Tue Aug 19 14:35:39 2008 +0930

    Don't pass useless handlers around in HandleIncludeKeycodes.
    
    What use is a handler if we only ever use one function anyway?