Merge branch 'Use_env_get_string' into CPlusPlus

Conflicts:
	function.cpp
This commit is contained in:
Siteshwar Vashisht
2012-01-14 11:59:48 +05:30
17 changed files with 413 additions and 139 deletions

View File

@@ -152,8 +152,10 @@ static void autoload_names( array_list_t *out, int get_hidden )
{
size_t i;
const wchar_t *path_var = env_get( L"fish_function_path" );
array_list_t path_list;
const wcstring path_var_wstr = env_get_string( L"fish_function_path" );
const wchar_t *path_var = path_var_wstr.empty()?NULL:path_var_wstr.c_str();
if( ! path_var )
return;