mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-18 17:29:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Clean up files unused by mcedit anymore.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2020-05-03 11:23:20 +03:00
parent 81b1f47e01
commit b65a951ee4
2 changed files with 23 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/mcconfig/paths.c
View File

@ -70,8 +70,6 @@ static const struct
{ "menu", &mc_config_str, MC_USERMENU_FILE}, { "menu", &mc_config_str, MC_USERMENU_FILE},
{ "cedit" PATH_SEP_STR "Syntax", &mc_config_str, EDIT_HOME_SYNTAX_FILE}, { "cedit" PATH_SEP_STR "Syntax", &mc_config_str, EDIT_HOME_SYNTAX_FILE},
{ "cedit" PATH_SEP_STR "menu", &mc_config_str, EDIT_HOME_MENU}, { "cedit" PATH_SEP_STR "menu", &mc_config_str, EDIT_HOME_MENU},
{ "cedit" PATH_SEP_STR "edit.indent.rc", &mc_config_str, EDIT_HOME_DIR PATH_SEP_STR "edit.indent.rc"},
{ "cedit" PATH_SEP_STR "edit.spell.rc", &mc_config_str, EDIT_HOME_DIR PATH_SEP_STR "edit.spell.rc"},
{ "panels.ini", &mc_config_str, MC_PANELS_FILE}, { "panels.ini", &mc_config_str, MC_PANELS_FILE},
/* User should move this file with applying some changes in file */ /* User should move this file with applying some changes in file */
@ -109,18 +107,16 @@ static const struct
} mc_config_migrate_rules_fix[] = } mc_config_migrate_rules_fix[] =
{ {
/* *INDENT-OFF* */ /* *INDENT-OFF* */
{ &mc_data_str, MC_USERMENU_FILE, &mc_config_str}, { &mc_data_str, MC_USERMENU_FILE, &mc_config_str},
{ &mc_data_str, EDIT_HOME_SYNTAX_FILE, &mc_config_str}, { &mc_data_str, EDIT_HOME_SYNTAX_FILE, &mc_config_str},
{ &mc_data_str, EDIT_HOME_MENU, &mc_config_str}, { &mc_data_str, EDIT_HOME_MENU, &mc_config_str},
{ &mc_data_str, EDIT_HOME_DIR PATH_SEP_STR "edit.indent.rc", &mc_config_str}, { &mc_data_str, MC_FILEBIND_FILE, &mc_config_str},
{ &mc_data_str, EDIT_HOME_DIR PATH_SEP_STR "edit.spell.rc", &mc_config_str},
{ &mc_data_str, MC_FILEBIND_FILE, &mc_config_str},
{ &mc_cache_str, MC_HISTORY_FILE, &mc_data_str}, { &mc_cache_str, MC_HISTORY_FILE, &mc_data_str},
{ &mc_cache_str, MC_FILEPOS_FILE, &mc_data_str}, { &mc_cache_str, MC_FILEPOS_FILE, &mc_data_str},
{ &mc_cache_str, EDIT_HOME_CLIP_FILE, &mc_data_str}, { &mc_cache_str, EDIT_HOME_CLIP_FILE, &mc_data_str},
{ &mc_cache_str, MC_PANELS_FILE, &mc_config_str}, { &mc_cache_str, MC_PANELS_FILE, &mc_config_str},
{NULL, NULL, NULL} {NULL, NULL, NULL}
/* *INDENT-ON* */ /* *INDENT-ON* */

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

@ -116,73 +116,65 @@ static const struct test_user_config_paths_ds
}, },
{ /* 7. */ { /* 7. */
CONF_MAIN, CONF_MAIN,
EDIT_HOME_DIR PATH_SEP_STR "edit.indent.rc" MC_PANELS_FILE
}, },
{ /* 8. */ { /* 8. */
CONF_MAIN,
EDIT_HOME_DIR PATH_SEP_STR "edit.spell.rc"
},
{ /* 9. */
CONF_MAIN,
MC_PANELS_FILE
},
{ /* 10. */
CONF_MAIN, CONF_MAIN,
MC_FILEBIND_FILE MC_FILEBIND_FILE
}, },
{ /* 11. */ { /* 9. */
CONF_DATA, CONF_DATA,
MC_SKINS_SUBDIR MC_SKINS_SUBDIR
}, },
{ /* 12. */ { /* 10. */
CONF_DATA, CONF_DATA,
FISH_PREFIX FISH_PREFIX
}, },
{ /* 13. */ { /* 11. */
CONF_DATA, CONF_DATA,
"ashrc" "ashrc"
}, },
{ /* 14. */ { /* 12. */
CONF_DATA, CONF_DATA,
"bashrc" "bashrc"
}, },
{ /* 15. */ { /* 13. */
CONF_DATA, CONF_DATA,
"inputrc" "inputrc"
}, },
{ /* 16. */ { /* 14. */
CONF_DATA, CONF_DATA,
MC_EXTFS_DIR MC_EXTFS_DIR
}, },
{ /* 17. */ { /* 15. */
CONF_DATA, CONF_DATA,
MC_HISTORY_FILE MC_HISTORY_FILE
}, },
{ /* 18. */ { /* 16. */
CONF_DATA, CONF_DATA,
MC_FILEPOS_FILE MC_FILEPOS_FILE
}, },
{ /* 19. */ { /* 17. */
CONF_DATA, CONF_DATA,
EDIT_HOME_CLIP_FILE EDIT_HOME_CLIP_FILE
}, },
{ /* 20. */ { /* 18. */
CONF_DATA, CONF_DATA,
MC_MACRO_FILE MC_MACRO_FILE
}, },
{ /* 21. */ { /* 19. */
CONF_CACHE, CONF_CACHE,
"mc.log" "mc.log"
}, },
{ /* 22. */ { /* 20. */
CONF_CACHE, CONF_CACHE,
MC_TREESTORE_FILE MC_TREESTORE_FILE
}, },
{ /* 23. */ { /* 21. */
CONF_CACHE, CONF_CACHE,
EDIT_HOME_TEMP_FILE EDIT_HOME_TEMP_FILE
}, },
{ /* 24. */ { /* 22. */
CONF_CACHE, CONF_CACHE,
EDIT_HOME_BLOCK_FILE EDIT_HOME_BLOCK_FILE
}, },