[PATCH] libX11: allow inclusion of system level compose files

[Julien Cristau]

On Wed, Oct 21, 2009 at 17:29:52 -0400, James Cloos wrote:

> >>>>> "Julien" == Julien Cristau <jcristau at debian.org> writes:
> 
> >> ru_RU.UTF-8/Compose.pre> include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
> 
> Julien> ru_RU.UTF-8/Compose.pre should really go away though, I think,
> Julien> and be replaced by an entry in compose.dir.
> 
> Heh.  There already is one from commit c6349f43:
> 
> libX11/nls/compose.dir.pre> en_US.UTF-8/Compose:            ru_RU.UTF-8
> 
> which merged in:
> 
> > +XCOMM $XFree86: xc/nls/compose.dir,v 1.24 2003/08/06 14:04:00 eich Exp $
> 
> Commit e3198b55, which added the ru_RU.UTF-8 directory also edited
> nls/locale.dir.pre to enable the new nls/ru_RU.UTF-8/XLC_LOCALE.pre,
> but did not edit nls/compose.dir.pre to enable the new
> nls/ru_RU.UTF-8/Compose.pre.
> 
> [SIGH]
> 
> (Although it is not specified in the commit, I had signed off on
> what became e3198b55 during the on-list discussions.)
> 
> I presume, then, that nls/ru_RU.UTF-8/Compose.pre and its Makefile code
> are superfluous, yes?
> 
Looks that way.  I wonder how I missed that before I pushed that patch.

Cheers,
Julien