Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Must load universal variables earlier, and issue a barrier after erasing

Browse source 
one.

Fixes #1526
This commit is contained in:
ridiculousfish 2014-07-06 18:04:30 -07:00
parent 195cd130f8
commit 5cda1e55e0
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
env.cpp
View file

@ -559,6 +559,7 @@ void env_init(const struct config_paths_t *paths /* or NULL */)
/* Set up universal variables. The empty string means to use the deafult path. */ /* Set up universal variables. The empty string means to use the deafult path. */
assert(s_universal_variables == NULL); assert(s_universal_variables == NULL);
s_universal_variables = new env_universal_t(L""); s_universal_variables = new env_universal_t(L"");
s_universal_variables->load();
/* /*
Set up SHLVL variable Set up SHLVL variable
@ -905,6 +906,10 @@ int env_remove(const wcstring &key, int var_mode)
!(var_mode & ENV_LOCAL)) !(var_mode & ENV_LOCAL))
{ {
erased = uvars() && uvars()->remove(key); erased = uvars() && uvars()->remove(key);
if (erased)
{
env_universal_barrier();
}
} }
react_to_variable_change(key); react_to_variable_change(key);