diff options
| author | Keith Packard <keithp@keithp.com> | 2011-06-07 12:31:15 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-07 12:31:15 -0700 |
| commit | 02d11af01211da55e9d93fe0e1851a0c6fe57472 (patch) | |
| tree | 7569f7028fdd012da1fd1d3f6a8ccbe546fb07af | |
| parent | bf9fd0a83eef771ee018438f05e2d9f20b43539b (diff) | |
| parent | ab0df72cd33f011cc48736cfbfce9bbe9c359a80 (diff) | |
Merge remote-tracking branch 'kibi/master'
| -rw-r--r-- | xkb/xkbfmisc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c index 1ac9d8262..d8202b496 100644 --- a/xkb/xkbfmisc.c +++ b/xkb/xkbfmisc.c @@ -62,7 +62,7 @@ unsigned set,rtrn; rtrn|= _XkbKSUpper; } if (((ks>=XK_a)&&(ks<=XK_z))|| - ((ks>=XK_agrave)&&(ks<=XK_ydiaeresis))) { + ((ks>=XK_ssharp)&&(ks<=XK_ydiaeresis)&&(ks!=XK_division))) { rtrn|= _XkbKSLower; } break; @@ -71,7 +71,7 @@ unsigned set,rtrn; ((ks>=XK_Racute)&&(ks<=XK_Tcedilla))) { rtrn|= _XkbKSUpper; } - if (((ks>=XK_aogonek)&&(ks<=XK_zabovedot)&&(ks!=XK_caron))|| + if (((ks>=XK_aogonek)&&(ks<=XK_zabovedot)&&(ks!=XK_ogonek)&&(ks!=XK_caron)&&(ks!=XK_doubleacute))|| ((ks>=XK_racute)&&(ks<=XK_tcedilla))) { rtrn|= _XkbKSLower; } @@ -92,7 +92,8 @@ unsigned set,rtrn; ((ks>=XK_Amacron)&&(ks<=XK_Umacron))) { rtrn|= _XkbKSUpper; } - if (((ks>=XK_rcedilla)&&(ks<=XK_tslash))|| + if ((ks==XK_kra)|| + ((ks>=XK_rcedilla)&&(ks<=XK_tslash))|| (ks==XK_eng)|| ((ks>=XK_amacron)&&(ks<=XK_umacron))) { rtrn|= _XkbKSLower; |