libX11: Changes to 'master'

[Alan Coopersmith]

 include/X11/Xlib.h             |   17 -----------------
 modules/om/generic/omGeneric.c |    2 +-
 src/xlibi18n/lcStd.c           |   10 ----------
 3 files changed, 1 insertion(+), 28 deletions(-)

New commits:
commit 3d69b0a83e62f8f6fbdd952fc49cdbdf8825e1e6
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Thu Oct 7 18:46:08 2010 +0100

    Don't try so hard to find a matching font with the given encoding
    
    See http://sourceware.org/bugzilla/show_bug.cgi?id=10948
    
    Currently, if the locale is UTF-8, no CJK fonts are installed, and someone
    does XCreateFontSet() with a font name of "*", we end up asking the server
    to list the (non-existent) fonts 11 times for each CJK encoding, which can
    take a while.
    
    A * wildcard can match multiple components in a XLFD name in XListFonts(),
    so there's no need to try adding more than one to get a match.
    
    We do try once with a leading '*-' in case the fontname isn't a full
    well-formed XLFD name, maybe even that isn't needed?
    
    (See also http://invisible-island.net/xterm/xterm.faq.html#slow_menus)
    
    Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 7e163300735d4bcd3386b86eec112acdad139c59
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Dec 2 21:51:27 2013 -0800

    unifdef -UISC
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>