From 7b16802972ec93db3c584488b89b1c40f31d5d27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Tue, 8 Dec 2020 19:49:43 +0100
Subject: [PATCH] config: remove support for loading configuration from footrc

---
 CHANGELOG.md       |  4 ++++
 config.c           | 24 ------------------------
 doc/foot.ini.5.scd |  2 --
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac69ddd3..1d78e588 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -98,6 +98,10 @@ means foot can be PGO:d in e.g. sandboxed build scripts. See
 
 ### Deprecated
 ### Removed
+
+* Support for loading configuration from `$XDG_CONFIG_HOME/footrc`.
+
+
 ### Fixed
 
 * Error when re-assigning a default key binding
diff --git a/config.c b/config.c
index b37d1a25..1cfaafb2 100644
--- a/config.c
+++ b/config.c
@@ -272,7 +272,6 @@ static struct config_file
 open_config(struct config *conf)
 {
     struct config_file ret = {.path = NULL, .fd = -1};
-    bool log_deprecation = false;
 
     path_components_t components = tll_init();
 
@@ -311,12 +310,6 @@ open_config(struct config *conf)
         }
     }
 
-    /* Next try footrc */
-    if (tll_length(components) > 0 && try_open_file(&components, "footrc")) {
-        log_deprecation = true;
-        goto done;
-    }
-
     /* Finally, try foot/foot.ini in all XDG_CONFIG_DIRS */
     const char *xdg_config_dirs = getenv("XDG_CONFIG_DIRS");
     xdg_config_dirs_copy = xdg_config_dirs != NULL
@@ -357,23 +350,6 @@ out:
 done:
     assert(tll_length(components) > 0);
     ret = path_components_to_config_file(&components);
-
-    if (log_deprecation && ret.path != NULL) {
-        LOG_WARN("deprecated: configuration in $XDG_CONFIG_HOME/footrc, "
-                 "use $XDG_CONFIG_HOME/foot/foot.ini instead");
-
-        char *text = xstrdup(
-            "configuration in \033[31m$XDG_CONFIG_HOME/footrc\033[39m or "
-            "\033[31m~/.config/footrc\033[39m, "
-            "use \033[32m$XDG_CONFIG_HOME/foot/foot.ini\033[39m or "
-            "\033[32m~/.config/foot/foot.ini\033[39m instead");
-
-        struct user_notification deprecation = {
-            .kind = USER_NOTIFICATION_DEPRECATED,
-            .text = text,
-        };
-        tll_push_back(conf->notifications, deprecation);
-    }
     goto out;
 }
 
diff --git a/doc/foot.ini.5.scd b/doc/foot.ini.5.scd
index 24632f8f..14cd6d16 100644
--- a/doc/foot.ini.5.scd
+++ b/doc/foot.ini.5.scd
@@ -14,8 +14,6 @@ in this order:
 
 - *XDG_CONFIG_HOME/foot/foot.ini*
 - *~/.config/foot/foot.ini*
-- *XDG_CONFIG_HOME/footrc*
-- *~/.config/footrc*
 - *XDG_CONFIG_DIRS/foot/foot.ini*
 
 # SECTION: default