libX11: Changes to 'master'

[James Cloos]

 modules/im/ximcp/imLcPrs.c |   16 ++++++++++++++++
 src/xlibi18n/lcFile.c      |    2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 9df349a7894725f9469b106af645f57f7f3f9af3
Author: James Cloos <cloos at jhcloos.com>
Date:   Wed Jan 13 11:04:38 2010 -0500

    Allow inclusion of system level compose files.
    
    With the release of XFree86 4.4 an inclusion system of compose files was
    added to Xlib to allow inclusion of the default compose file (with %L),
    any compose files from user’s home directory (with %H), or a compose
    file with a hard coded path¹. However, even today including system level
    compose files is not possible in a platform independent manner although
    the machinery for including compose files and overriding previously
    defined compositions is already in place.
    
    With the ability to include system level compose files one could greatly
    reduce the need for compose file rule duplication and the work needed to
    propagate changes in one compose file to others. For example, currently
    the Finnish compose file fi_FI.UTF-8 weights over 5000 lines² but it
    is almost identical with en_US.UTF-8 except for perhaps half a dozen
    compositions.
    
    This commit allows one to include system level compose files with the
    following kind of syntax:
    
    include "%S/en_US.UTF-8/Compose"
    
    1] http://www.xfree86.org/4.4.0/RELNOTES5.html#42
    2] http://cgit.freedesktop.org/xorg/lib/libX11/tree/nls/fi_FI.UTF-8/Compose.pre
    
    Signed-off-by: Marko Myllynen <myllynen at redhat.com>
    Signed-off-by: James Cloos <cloos at jhcloos.com>