summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/Zle/zle_main.c8
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d511f2d5d..8996a6c58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-21 Peter Stephenson <pws@csr.com>
+
+ * 20398: Src/Zle/zle_main.c: allow clean exit from within
+ a zle widget function.
+
2004-09-20 Peter Stephenson <pws@csr.com>
* 20391: Src/params.c: SHLVL didn't get updated in the
diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c
index dbe34a761..48511e017 100644
--- a/Src/Zle/zle_main.c
+++ b/Src/Zle/zle_main.c
@@ -680,7 +680,13 @@ zlecore(void)
FD_ZERO(&foofd);
#endif
- while (!done && !errflag) {
+ /*
+ * A widget function may decide to exit the shell.
+ * We never exit directly from functions, to allow
+ * the shell to tidy up, so we have to test for
+ * that explicitly.
+ */
+ while (!done && !errflag && !exit_pending) {
statusline = NULL;
vilinerange = 0;