h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-07-02 17:31:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

Migrate some env initialization into env_dispatch

Browse Source
This commit is contained in:
ridiculousfish
2019-03-31 19:51:08 -07:00
parent b67174b4a3
commit e7de9cc371
3 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/env.cpp
View File

@@ -687,7 +687,6 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
init_curses(vars);
init_input();
init_path_vars();
guess_emoji_width();
// Set up the USER and PATH variables
setup_path();
@@ -789,7 +788,7 @@ void env_init(const struct config_paths_t *paths /* or NULL */) {
vars.set_one(FISH_BIND_MODE_VAR, ENV_GLOBAL, DEFAULT_BIND_MODE);
// Allow changes to variables to produce events.
env_dispatch_init();
env_dispatch_init(vars);
// Set up universal variables. The empty string means to use the default path.
assert(s_universal_variables == NULL);