diff options
| author | Tanaka Akira <akr@users.sourceforge.net> | 1999-05-31 17:10:12 +0000 |
|---|---|---|
| committer | Tanaka Akira <akr@users.sourceforge.net> | 1999-05-31 17:10:12 +0000 |
| commit | f42e3fa8e6152e145251e8f16f4c61c23dec1f59 (patch) | |
| tree | 9a7b104b910ae53f6a49cb4e35c3dedc737e907b /Src/init.c | |
| parent | 4fec788fa5f6e7c9723e02e3d0b57068ce9785aa (diff) | |
| download | zsh-f42e3fa8e6152e145251e8f16f4c61c23dec1f59.tar.gz zsh-f42e3fa8e6152e145251e8f16f4c61c23dec1f59.tar.xz zsh-f42e3fa8e6152e145251e8f16f4c61c23dec1f59.zip | |
pws-20 dot-zsh-199906060520
Diffstat (limited to 'Src/init.c')
| -rw-r--r-- | Src/init.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/Src/init.c b/Src/init.c index 86d5aa505..7f1b2153a 100644 --- a/Src/init.c +++ b/Src/init.c @@ -759,26 +759,11 @@ run_init_scripts(void) source(GLOBAL_ZSHENV); #endif if (isset(RCS)) { - int globalfirst = isset(GLOBALRCSFIRST); - if (globalfirst) { -#ifdef GLOBAL_ZPROFILE - if (islogin) - source(GLOBAL_ZPROFILE); -#endif -#ifdef GLOBAL_ZSHRC - if (interact) - source(GLOBAL_ZSHRC); -#endif -#ifdef GLOBAL_ZLOGIN - if (islogin) - source(GLOBAL_ZLOGIN); -#endif - } if (unset(PRIVILEGED)) sourcehome(".zshenv"); if (islogin) { #ifdef GLOBAL_ZPROFILE - if (!globalfirst) + if (isset(GLOBALRCS)) source(GLOBAL_ZPROFILE); #endif if (unset(PRIVILEGED)) @@ -786,7 +771,7 @@ run_init_scripts(void) } if (interact) { #ifdef GLOBAL_ZSHRC - if (!globalfirst) + if (isset(GLOBALRCS)) source(GLOBAL_ZSHRC); #endif if (unset(PRIVILEGED)) @@ -794,7 +779,7 @@ run_init_scripts(void) } if (islogin) { #ifdef GLOBAL_ZLOGIN - if (!globalfirst) + if (isset(GLOBALRCS)) source(GLOBAL_ZLOGIN); #endif if (unset(PRIVILEGED)) |