20398: allow clean exit from within widget function

1 files changed, 7 insertions, 1 deletions

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;