From 137a0c4e596409a1d35f0f6ea1bd6e4fcd5a3831 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 7 Jul 2002 21:16:35 +0000 Subject: allow style options in the rc file to override those found in the style --- src/Screen.cc | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'src/Screen.cc') 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) -- cgit v1.2.3