Mon May 10 18:43:15 2004 Michael Jennings (mej)

Revert change from February 29th.  I never could reproduce it anyway.


SVN revision: 10158

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 3f46832..1711573 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5215,3 +5215,7 @@ Enable title-reporting and iconname-reporting escape sequences only if
 specifically requested by user at compile time.  This exists solely to
 protect the ignorant and careless from themselves.
 ----------------------------------------------------------------------
+Mon May 10 18:43:15 2004                        Michael Jennings (mej)
+
+Revert change from February 29th.  I never could reproduce it anyway.
+----------------------------------------------------------------------
diff --git a/src/startup.c b/src/startup.c
index 17cb19a..2b6cb5e 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))) != NULL) {
+    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) {
         char *tmp;
 
         D_OPTIONS(("conf_parse_theme() returned \"%s\"\n", user_dir));