From b65a951ee4bfd2a9e109a5e3c663d73fa5408346 Mon Sep 17 00:00:00 2001
From: Andrew Borodin <aborodin@vmail.ru>
Date: Sun, 3 May 2020 11:23:20 +0300
Subject: [PATCH] Clean up files unused by mcedit anymore.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
---
 lib/mcconfig/paths.c                   | 20 ++++++--------
 tests/lib/mcconfig/user_configs_path.c | 38 ++++++++++----------------
 2 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/lib/mcconfig/paths.c b/lib/mcconfig/paths.c
index 70aec629f..eaec98272 100644
--- a/lib/mcconfig/paths.c
+++ b/lib/mcconfig/paths.c
@@ -70,8 +70,6 @@ static const struct
     { "menu",                                  &mc_config_str, MC_USERMENU_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 "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},
 
     /* User should move this file with applying some changes in file */
@@ -109,18 +107,16 @@ static const struct
 } mc_config_migrate_rules_fix[] =
 {
     /* *INDENT-OFF* */
-    { &mc_data_str, MC_USERMENU_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_DIR PATH_SEP_STR "edit.indent.rc", &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_data_str, MC_USERMENU_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, MC_FILEBIND_FILE,      &mc_config_str},
 
-    { &mc_cache_str, MC_HISTORY_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, MC_HISTORY_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, MC_PANELS_FILE,                             &mc_config_str},
+    { &mc_cache_str, MC_PANELS_FILE,       &mc_config_str},
 
     {NULL, NULL, NULL}
     /* *INDENT-ON* */
diff --git a/tests/lib/mcconfig/user_configs_path.c b/tests/lib/mcconfig/user_configs_path.c
index 874fa3964..893764d80 100644
--- a/tests/lib/mcconfig/user_configs_path.c
+++ b/tests/lib/mcconfig/user_configs_path.c
@@ -116,73 +116,65 @@ static const struct test_user_config_paths_ds
     },
     { /* 7. */
         CONF_MAIN,
-        EDIT_HOME_DIR PATH_SEP_STR "edit.indent.rc"
+        MC_PANELS_FILE
     },
     { /* 8. */
-        CONF_MAIN,
-        EDIT_HOME_DIR PATH_SEP_STR "edit.spell.rc"
-    },
-    { /* 9. */
-        CONF_MAIN,
-        MC_PANELS_FILE
-    },
-    { /* 10. */
         CONF_MAIN,
         MC_FILEBIND_FILE
     },
-    { /* 11. */
+    { /* 9. */
         CONF_DATA,
         MC_SKINS_SUBDIR
     },
-    { /* 12. */
+    { /* 10. */
         CONF_DATA,
         FISH_PREFIX
     },
-    { /* 13. */
+    { /* 11. */
         CONF_DATA,
         "ashrc"
     },
-    { /* 14. */
+    { /* 12. */
         CONF_DATA,
         "bashrc"
     },
-    { /* 15. */
+    { /* 13. */
         CONF_DATA,
         "inputrc"
     },
-    { /* 16. */
+    { /* 14. */
         CONF_DATA,
         MC_EXTFS_DIR
     },
-    { /* 17. */
+    { /* 15. */
         CONF_DATA,
         MC_HISTORY_FILE
     },
-    { /* 18. */
+    { /* 16. */
         CONF_DATA,
         MC_FILEPOS_FILE
     },
-    { /* 19. */
+    { /* 17. */
         CONF_DATA,
         EDIT_HOME_CLIP_FILE
     },
-    { /* 20. */
+    { /* 18. */
         CONF_DATA,
         MC_MACRO_FILE
     },
-    { /* 21. */
+    { /* 19. */
         CONF_CACHE,
         "mc.log"
     },
-    { /* 22. */
+    { /* 20. */
         CONF_CACHE,
         MC_TREESTORE_FILE
     },
-    { /* 23. */
+    { /* 21. */
         CONF_CACHE,
         EDIT_HOME_TEMP_FILE
     },
-    { /* 24. */
+    { /* 22. */
         CONF_CACHE,
         EDIT_HOME_BLOCK_FILE
     },