mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-16 14:41:02 +02:00
Code Releases Activity

25384: fix problem with incorrect autoloads of zsh/zle

Browse source
This commit is contained in:
Peter Stephenson 2008-08-04 17:32:19 +00:00
parent 6e4adee615
commit 4fc027edf0
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2008-08-04 Peter Stephenson <pws@csr.com> 2008-08-04 Peter Stephenson <pws@csr.com>
* 25384: Src/init.c: fix problem with autoload of zsh/zle
for warning message at boot.
* users/13093: Src/module.c: HashNode changes didn't * users/13093: Src/module.c: HashNode changes didn't
get propagated to AIX-specific code. get propagated to AIX-specific code.

24
Src/init.c
View file

@ -1206,14 +1206,22 @@ VA_DCL
/* autoload */ /* autoload */
switch (zle_load_state) { switch (zle_load_state) {
case 0: case 0:
if (load_module("zsh/zle", NULL, 0) != 1) { /*
(void)load_module("zsh/compctl", NULL, 0); * Some commands don't require us to load ZLE.
ret = zle_entry_ptr(cmd, ap); * These also have no fallback.
/* Don't execute fallback code */ */
cmd = -1; if (cmd != ZLE_CMD_TRASH && cmd != ZLE_CMD_RESET_PROMPT &&
} else { cmd != ZLE_CMD_REFRESH)
zle_load_state = 2; {
/* Execute fallback code below */ if (load_module("zsh/zle", NULL, 0) != 1) {
(void)load_module("zsh/compctl", NULL, 0);
ret = zle_entry_ptr(cmd, ap);
/* Don't execute fallback code */
cmd = -1;
} else {
zle_load_state = 2;
/* Execute fallback code below */
}
} }
break; break;