mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3687_hotlist_in_data_dir'

Browse Source 
* 3687_hotlist_in_data_dir:
  Ticket #3687: store the 'hotlist' file in data dir, not config dir.
This commit is contained in:
Andrew Borodin 2016-12-04 09:48:52 +03:00
commit 4095a04a92
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mcconfig/paths.c
View File

@ -65,7 +65,6 @@ static const struct
/* config */ /* config */
{ "ini", &mc_config_str, MC_CONFIG_FILE}, { "ini", &mc_config_str, MC_CONFIG_FILE},
{ "filehighlight.ini", &mc_config_str, MC_FHL_INI_FILE}, { "filehighlight.ini", &mc_config_str, MC_FHL_INI_FILE},
{ "hotlist", &mc_config_str, MC_HOTLIST_FILE},
{ "mc.keymap", &mc_config_str, GLOBAL_KEYMAP_FILE}, { "mc.keymap", &mc_config_str, GLOBAL_KEYMAP_FILE},
{ "menu", &mc_config_str, MC_USERMENU_FILE}, { "menu", &mc_config_str, MC_USERMENU_FILE},
{ "cedit" PATH_SEP_STR "Syntax", &mc_config_str, EDIT_SYNTAX_FILE}, { "cedit" PATH_SEP_STR "Syntax", &mc_config_str, EDIT_SYNTAX_FILE},
@ -86,6 +85,7 @@ static const struct
{ "extfs.d", &mc_data_str, MC_EXTFS_DIR}, { "extfs.d", &mc_data_str, MC_EXTFS_DIR},
{ "history", &mc_data_str, MC_HISTORY_FILE}, { "history", &mc_data_str, MC_HISTORY_FILE},
{ "filepos", &mc_data_str, MC_FILEPOS_FILE}, { "filepos", &mc_data_str, MC_FILEPOS_FILE},
{ "hotlist", &mc_data_str, MC_HOTLIST_FILE},
{ "cedit" PATH_SEP_STR "cooledit.clip", &mc_data_str, EDIT_CLIP_FILE}, { "cedit" PATH_SEP_STR "cooledit.clip", &mc_data_str, EDIT_CLIP_FILE},
{ "", &mc_data_str, MC_MACRO_FILE}, { "", &mc_data_str, MC_MACRO_FILE},
@ -109,6 +109,8 @@ static const struct
} mc_config_migrate_rules_fix[] = } mc_config_migrate_rules_fix[] =
{ {
/* *INDENT-OFF* */ /* *INDENT-OFF* */
{ &mc_config_str, MC_HOTLIST_FILE, &mc_data_str},
{ &mc_data_str, MC_USERMENU_FILE, &mc_config_str}, { &mc_data_str, MC_USERMENU_FILE, &mc_config_str},
{ &mc_data_str, EDIT_SYNTAX_FILE, &mc_config_str}, { &mc_data_str, EDIT_SYNTAX_FILE, &mc_config_str},
{ &mc_data_str, EDIT_HOME_MENU, &mc_config_str}, { &mc_data_str, EDIT_HOME_MENU, &mc_config_str},

2
tests/lib/mcconfig/user_configs_path.c
View File

@ -93,7 +93,7 @@ static const struct test_user_config_paths_ds
MC_FHL_INI_FILE MC_FHL_INI_FILE
}, },
{ /* 2. */ { /* 2. */
CONF_MAIN, CONF_DATA,
MC_HOTLIST_FILE MC_HOTLIST_FILE
}, },
{ /* 3. */ { /* 3. */