Merge branch 'master' into autotools-conversion

2020-03-23 12:55:32 -06:00
parent 8f2fe85639 15a2032626
commit 11af2add7e
6 changed files with 9 additions and 9 deletions
--- a/cde/lib/DtWidget/Editor.c
+++ b/cde/lib/DtWidget/Editor.c
@@ -3736,7 +3736,7 @@ GetModeSwitchModifier(
    for (mapIndex = 3*pMap->max_keypermod; mapIndex < mapSize; mapIndex++) {
        /* look only at the first 4 columns of key map */
        for (keyCol = 0; keyCol < 4; keyCol++) {
-          keySym = XKeycodeToKeysym(dpy, pMap->modifiermap[mapIndex], keyCol);
+          keySym = XkbKeycodeToKeysym(dpy, pMap->modifiermap[mapIndex], keyCol);
          if (keySym == XK_Mode_switch)
             modeSwitchModMask |= 1 << (mapIndex / pMap->max_keypermod);
        }