Re: wscons.c chooses wrong variant for br layout

[Anthony J. Bentley]

Matthieu Herrb writes:
> > cf becomes "variant fr-legacy" instead of "variant fr".
> > 
> > cf.nodead becomes "variant fr-legacy" instead of "variant
> > fr_nodeadkeys".
>
> I don't know the subtilities of the canadian french keyboards, but
> that looks as a a behaviour change (even though it's more correct). Is
> it ok for canadian french keyboard users?

It is a behavior change, but one that restores the original
intent of the code:

struct nameint kbdvar[] = {
        {KB_NODEAD | KB_SG, "de_nodeadkeys"},
        {KB_NODEAD | KB_SF, "fr_nodeadkeys"},
        {KB_SF, "fr"},
        {KB_DVORAK | KB_CF, "fr-dvorak"},
        {KB_DVORAK | KB_FR, "bepo"},
        {KB_DVORAK, "dvorak"},
        {KB_CF, "fr-legacy"},
        {KB_NODEAD, "nodeadkeys"},
        {0}
};