diff options
| author | Adam Jackson <ajax@benzedrine.nwnk.net> | 2006-10-11 15:56:45 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@benzedrine.nwnk.net> | 2006-10-11 15:56:45 -0400 |
| commit | 61f3eb816b47f31e856eca32bca7e2e947faf533 (patch) | |
| tree | 712ac5ae1988ddedff4153e0b05f8c08c1f4f70d /xkb | |
| parent | cde68728860179dc84e615ccb378ce992513fd62 (diff) | |
Back out merge of master to 1.2 branch. Undoes 89987ca...
Dear git: please make 'git-revert' work on merge commits kthnxbye.
Diffstat (limited to 'xkb')
| -rw-r--r-- | xkb/ddxList.c | 2 | ||||
| -rw-r--r-- | xkb/xkbUtils.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/xkb/ddxList.c b/xkb/ddxList.c index 034f694ed..f94a869ae 100644 --- a/xkb/ddxList.c +++ b/xkb/ddxList.c @@ -269,7 +269,7 @@ char tmpname[PATH_MAX]; #ifndef WIN32 if (haveDir) fclose(in); - else if ((rval=Pclose(in))!=0) { + else if ((rval=pclose(in))!=0) { if (xkbDebugFlags) ErrorF("xkbcomp returned exit code %d\n",rval); } diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c index 26ff35e89..ee0abbeae 100644 --- a/xkb/xkbUtils.c +++ b/xkb/xkbUtils.c @@ -754,12 +754,12 @@ unsigned char grp; grp= state->locked_group; - if (grp>=ctrls->num_groups) - state->locked_group= XkbAdjustGroup(XkbCharToInt(grp),ctrls); + if (grp>=ctrls->num_groups || grp < 0) + state->locked_group= XkbAdjustGroup(grp,ctrls); grp= state->locked_group+state->base_group+state->latched_group; - if (grp>=ctrls->num_groups) - state->group= XkbAdjustGroup(XkbCharToInt(grp),ctrls); + if (grp>=ctrls->num_groups || grp < 0) + state->group= XkbAdjustGroup(grp,ctrls); else state->group= grp; XkbComputeCompatState(xkbi); return; |