summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-02-11 13:14:55 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-02-11 13:14:55 +0000
commit38c2ce5c558db850d4a85c95255f43d593904d55 (patch)
tree8032f108ca9bba555128f905f27a949ff9f388ec
parentc522504578e642f961ed29fb035e9e5da8f70521 (diff)
downloaddrakx-backup-do-not-use-38c2ce5c558db850d4a85c95255f43d593904d55.tar
drakx-backup-do-not-use-38c2ce5c558db850d4a85c95255f43d593904d55.tar.gz
drakx-backup-do-not-use-38c2ce5c558db850d4a85c95255f43d593904d55.tar.bz2
drakx-backup-do-not-use-38c2ce5c558db850d4a85c95255f43d593904d55.tar.xz
drakx-backup-do-not-use-38c2ce5c558db850d4a85c95255f43d593904d55.zip
for GRP_TOGGLE'd keyboard layouts, have "us,XX" instead of simply "XX"
(to have previous XFree's behaviour)
-rw-r--r--perl-install/keyboard.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index d4b0632b9..53acc6a3a 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -395,7 +395,7 @@ sub keyboard2full_xkb {
$XkbLayout eq 'br' ? 'abnt2' : 'pc105';
$XkbLayout ? {
- XkbLayout => $XkbLayout,
+ XkbLayout => join(',', if_($keyboard->{GRP_TOGGLE}, 'us'), $XkbLayout),
XkbModel => $XkbModel,
XkbOptions => $keyboard->{GRP_TOGGLE} ? "grp:$keyboard->{GRP_TOGGLE}" : '',
XkbCompat => $keyboard->{GRP_TOGGLE} ? "group_led" : '',