From a7937891ea723285cb840179076ba57b91ca2b59 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Sun, 22 Jul 2001 06:00:30 +0000 Subject: [PATCH] * setup.c (load_keys_from_section): Give ~/.mc/ini preference over mc.lib. --- src/ChangeLog | 5 +++++ src/setup.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 8371984f8..86dd19312 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2001-07-22 Pavel Roskin + + * setup.c (load_keys_from_section): Give ~/.mc/ini preference + over mc.lib. + 2001-07-20 Pavel Roskin * dlg.c: Remove dependency on definitions in gconf.h. diff --git a/src/setup.c b/src/setup.c index 06ed4ee85..c78e982a7 100644 --- a/src/setup.c +++ b/src/setup.c @@ -731,11 +731,15 @@ load_keys_from_section (char *terminal, char *profile_name) void load_key_defs (void) { char *libfile = concat_dir_and_file (mc_home, "mc.lib"); - load_keys_from_section (getenv ("TERM"), profile_name); - load_keys_from_section ("general", profile_name); + /* + * Load keys from mc.lib before ~/.mc/ini, so that the user + * definitions override global settings. + */ load_keys_from_section (getenv ("TERM"), libfile); load_keys_from_section ("general", libfile); + load_keys_from_section (getenv ("TERM"), profile_name); + load_keys_from_section ("general", profile_name); /* We don't want a huge database loaded in core */ free_profile_name (libfile);