allow style options in the rc file to override those found in the style

1 files changed, 2 insertions, 16 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index 3a94a4a5..ca94e75a 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -739,24 +739,10 @@ void BScreen::LoadStyle(void) {
     }
   }
 
-  string s;
-
-  if (config->getValue("rootCommand", s))
-    printf("config.rootCommand: %s\n", s.c_str());
-  
-  if (style.getValue("rootCommand", s))
-    printf("style.rootCommand: %s\n", s.c_str());
-
   // merge in the rc file
-  style.merge(config, True);
+  style.merge(config->file(), True);
 
-  printf("merged databases\n");
-
-  if (style.getValue("rootCommand", s))
-    printf("style.rootCommand: %s\n", s.c_str());
-
-  if (style.getValue("session.cacheMax", s))
-    printf("session.cacheMax: %s\n", s.c_str());
+  string s;
 
   // load fonts/fontsets
   if (resource.wstyle.font)