* setup.c (load_keys_from_section): Give ~/.mc/ini preference

over mc.lib.

src/ChangeLog

@@ -1,3 +1,8 @@
+2001-07-22  Pavel Roskin  <proski@gnu.org>
+
+	* setup.c (load_keys_from_section): Give ~/.mc/ini preference
+	over mc.lib.
+
 2001-07-20  Pavel Roskin  <proski@gnu.org>
 
 	* dlg.c: Remove dependency on definitions in gconf.h.

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);