From 4272606b8eff122d2fc6a74884754757de595e0c Mon Sep 17 00:00:00 2001 From: Michael Jennings Date: Sun, 29 Feb 2004 22:46:12 +0000 Subject: [PATCH] Sun Feb 29 17:51:48 2004 Michael Jennings (mej) Disable use of ~/user.cfg as requested by Laurence J. Lane . SVN revision: 9166 --- ChangeLog | 5 +++++ Eterm-mdk.spec => doc/Eterm-mdk.spec | 0 src/startup.c | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) rename Eterm-mdk.spec => doc/Eterm-mdk.spec (100%) diff --git a/ChangeLog b/ChangeLog index d0bd378..ed2c9d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5173,3 +5173,8 @@ Wed Feb 11 14:06:20 2004 Michael Jennings (mej) Fixed handling of escape sequences while printing. Pointed out by Tom A. Cox . ---------------------------------------------------------------------- +Sun Feb 29 17:51:48 2004 Michael Jennings (mej) + +Disable use of ~/user.cfg as requested by Laurence J. Lane +. +---------------------------------------------------------------------- diff --git a/Eterm-mdk.spec b/doc/Eterm-mdk.spec similarity index 100% rename from Eterm-mdk.spec rename to doc/Eterm-mdk.spec diff --git a/src/startup.c b/src/startup.c index 2b6cb5e..17cb19a 100644 --- a/src/startup.c +++ b/src/startup.c @@ -156,7 +156,7 @@ eterm_bootstrap(int argc, char *argv[]) sprintf(tmp, "ETERM_THEME_ROOT=%s", theme_dir); putenv(tmp); } - if ((user_dir = conf_parse_theme(&rs_theme, (rs_config_file ? rs_config_file : USER_CFG), (PARSE_TRY_USER_THEME | PARSE_TRY_NO_THEME))) != NULL) { + if ((user_dir = conf_parse_theme(&rs_theme, (rs_config_file ? rs_config_file : USER_CFG), (PARSE_TRY_USER_THEME))) != NULL) { char *tmp; D_OPTIONS(("conf_parse_theme() returned \"%s\"\n", user_dir));