summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/init.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a628e8511..b9a5c1398 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-30 Bart Schaefer <schaefer@zsh.org>
+
+ * 15191: Src/init.c: Don't infinite loop if there's an error in
+ the user's precmd -- reset errflag after preprompt().
+
2001-06-29 Andrej Borsenkow <bor@zsh.org>
* 15183: zshconfig.ac: fix DLLD in non-ELF case
diff --git a/Src/init.c b/Src/init.c
index 3da057de9..cbfaf5ad0 100644
--- a/Src/init.c
+++ b/Src/init.c
@@ -107,7 +107,6 @@ loop(int toplevel, int justonce)
pushheap();
for (;;) {
freeheap();
- errflag = 0;
hbegin(1); /* init history mech */
if (isset(SHINSTDIN)) {
setblock_stdin();
@@ -116,6 +115,7 @@ loop(int toplevel, int justonce)
stophist = 3;
preprompt();
stophist = hstop;
+ errflag = 0;
}
}
intr(); /* interrupts on */