More work towards instanced parser

This commit is contained in:
ridiculousfish
2012-01-20 11:24:43 -08:00
parent 3d8face1f9
commit 7e486e3b5c
7 changed files with 38 additions and 46 deletions

View File

@@ -77,9 +77,10 @@ static int read_init()
wchar_t *config_dir_escaped;
void *context;
string_buffer_t *eval_buff;
parser_t parser();
eval( L"builtin . " DATADIR "/fish/config.fish 2>/dev/null", 0, TOP );
eval( L"builtin . " SYSCONFDIR L"/fish/config.fish 2>/dev/null", 0, TOP );
parser.eval( L"builtin . " DATADIR "/fish/config.fish 2>/dev/null", 0, TOP );
parser.eval( L"builtin . " SYSCONFDIR L"/fish/config.fish 2>/dev/null", 0, TOP );
/*
We need to get the configuration directory before we can source the user configuration file