summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-06-03 05:23:57 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-06-03 05:23:57 +0000
commita7105c1c377a10c16664446e58c616c25945a057 (patch)
treedb209641c25915bf40741977671fa50e126a3305 /perl-install
parentea607f14437a383766adf80dee4ccec500d7abf0 (diff)
downloaddrakx-a7105c1c377a10c16664446e58c616c25945a057.tar
drakx-a7105c1c377a10c16664446e58c616c25945a057.tar.gz
drakx-a7105c1c377a10c16664446e58c616c25945a057.tar.bz2
drakx-a7105c1c377a10c16664446e58c616c25945a057.tar.xz
drakx-a7105c1c377a10c16664446e58c616c25945a057.zip
rename load() into builtin_loadkeys()
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/keyboard.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index 301c2f7e1..f397efe93 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -477,7 +477,7 @@ sub from_DMI() {
$XkbModel && { XkbModel => $XkbModel };
}
-sub load {
+sub builtin_loadkeys {
my ($keymap) = @_;
return if $::testing;
@@ -573,7 +573,7 @@ sub setup_install {
log::l("loading keymap $kmap");
if (-e (my $f = "$ENV{SHARE_PATH}/keymaps/$kmap.bkmap")) {
- load(scalar cat_($f));
+ builtin_loadkeys(scalar cat_($f));
} elsif (-x '/bin/loadkeys') {
run_program::run('loadkeys', $kmap);
} else {