mirror/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-09-28 15:01:21 +02:00
Code

Vin Shelton: 22789: 22783 broke .zshenv

Browse Source
This commit is contained in:
Peter Stephenson 2006-09-29 20:43:33 +00:00
parent 9f2bf1f0f2
commit 85fd642711
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2006-09-29 Vin Shelton <acs@xemacs.org>
* 22789: Src/init.c: Source zshenv even if non-interactive.
2006-09-29 Andrey Borzenkov <bor@zsh.org>
* 22787: Srz/Zsh/compmatch.c: change calling convention of

18
Src/init.c
View File

@ -958,15 +958,17 @@ run_init_scripts(void)
source(GLOBAL_ZSHENV);
#endif
if (isset(RCS) && isset(INTERACTIVE) && unset(PRIVILEGED))
if (isset(RCS) && unset(PRIVILEGED))
{
/*
* Always attempt to load the newuser module to perform
* checks for new zsh users. Don't care if we can't load it.
*/
if (load_module_silence("zsh/newuser", 1)) {
/* Unload it immediately. */
unload_named_module("zsh/newuser", "zsh", 1);
if (isset(INTERACTIVE)) {
/*
* Always attempt to load the newuser module to perform
* checks for new zsh users. Don't care if we can't load it.
*/
if (load_module_silence("zsh/newuser", 1)) {
/* Unload it immediately. */
unload_named_module("zsh/newuser", "zsh", 1);
}
}
sourcehome(".zshenv");