mirror of
https://github.com/fish-shell/fish-shell.git
synced 2026-04-25 20:41:15 -03:00
Merge branch 'Use_env_get_string' into CPlusPlus
Conflicts: function.cpp
This commit is contained in:
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user