From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3092 invoked from network); 21 Sep 2004 13:11:03 -0000 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by ns1.primenet.com.au with SMTP; 21 Sep 2004 13:11:03 -0000 Received: (qmail 16469 invoked from network); 21 Sep 2004 13:10:56 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 21 Sep 2004 13:10:56 -0000 Received: (qmail 8619 invoked by alias); 21 Sep 2004 13:10:43 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 20398 Received: (qmail 8604 invoked from network); 21 Sep 2004 13:10:42 -0000 Received: from unknown (HELO a.mx.sunsite.dk) (130.225.247.88) by sunsite.dk with SMTP; 21 Sep 2004 13:10:42 -0000 Received: (qmail 15798 invoked from network); 21 Sep 2004 13:09:43 -0000 Received: from lhuumrelay3.lnd.ops.eu.uu.net (62.189.58.19) by a.mx.sunsite.dk with SMTP; 21 Sep 2004 13:09:42 -0000 Received: from MAILSWEEPER01.csr.com (mailhost1.csr.com [62.189.183.235]) by lhuumrelay3.lnd.ops.eu.uu.net (8.11.0/8.11.0) with ESMTP id i8LD9fv02710 for ; Tue, 21 Sep 2004 13:09:41 GMT Received: from EXCHANGE02.csr.com (unverified [192.168.137.45]) by MAILSWEEPER01.csr.com (Content Technologies SMTPRS 4.3.12) with ESMTP id for ; Tue, 21 Sep 2004 14:08:44 +0100 Received: from news01.csr.com ([192.168.143.38]) by EXCHANGE02.csr.com with Microsoft SMTPSVC(5.0.2195.6713); Tue, 21 Sep 2004 14:11:12 +0100 Received: from news01.csr.com (localhost.localdomain [127.0.0.1]) by news01.csr.com (8.12.11/8.12.11) with ESMTP id i8LD9boL009795 for ; Tue, 21 Sep 2004 14:09:37 +0100 Received: from csr.com (pws@localhost) by news01.csr.com (8.12.11/8.12.11/Submit) with ESMTP id i8LD9bEA009792 for ; Tue, 21 Sep 2004 14:09:37 +0100 Message-Id: <200409211309.i8LD9bEA009792@news01.csr.com> X-Authentication-Warning: news01.csr.com: pws owned process doing -bs To: zsh-workers@sunsite.dk (Zsh hackers list) Subject: PATCH: exiting shell from widget Date: Tue, 21 Sep 2004 14:09:36 +0100 From: Peter Stephenson X-OriginalArrivalTime: 21 Sep 2004 13:11:12.0096 (UTC) FILETIME=[7792FE00:01C49FDC] X-Spam-Checker-Version: SpamAssassin 2.63 on a.mx.sunsite.dk X-Spam-Level: X-Spam-Status: No, hits=0.0 required=6.0 tests=none autolearn=no version=2.63 X-Spam-Hits: 0.0 This chunk is needed if you want to be able to exit the shell cleanly from a zle widget (without prejudice to any circumstances whatsoever when you might or might not wish to do that). The comment explains why. Index: Src/Zle/zle_main.c =================================================================== RCS file: /cvsroot/zsh/zsh/Src/Zle/zle_main.c,v retrieving revision 1.53 diff -u -r1.53 zle_main.c --- Src/Zle/zle_main.c 20 Sep 2004 14:04:03 -0000 1.53 +++ Src/Zle/zle_main.c 21 Sep 2004 13:08:37 -0000 @@ -680,7 +680,13 @@ 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; -- Peter Stephenson Software Engineer CSR Ltd., Science Park, Milton Road, Cambridge, CB4 0WH, UK Tel: +44 (0)1223 692070 ********************************************************************** This email and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed. If you have received this email in error please notify the system manager. This footnote also confirms that this email message has been swept by MIMEsweeper for the presence of computer viruses. www.mimesweeper.com **********************************************************************