From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-29382-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 24824 invoked by alias); 27 May 2011 01:12:18 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 29382
Received: (qmail 13900 invoked from network); 27 May 2011 01:12:15 -0000
X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE
	autolearn=ham version=3.3.1
Received-SPF: none (ns1.primenet.com.au: domain at closedmail.com does not designate permitted sender hosts)
From: Bart Schaefer <schaefer@brasslantern.com>
Message-id: <110526181151.ZM27246@torch.brasslantern.com>
Date: Thu, 26 May 2011 18:11:51 -0700
In-reply-to: <20110526101428.71e440e9@pwslap01u.europe.root.pri>
Comments: In reply to Peter Stephenson <Peter.Stephenson@csr.com>
 "Re: TRAPALRM / TMOUT oddity" (May 26, 10:14am)
References: <110525204737.ZM24434@torch.brasslantern.com>
	<20110526101428.71e440e9@pwslap01u.europe.root.pri>
X-Mailer: OpenZMail Classic (0.9.2 24April2005)
To: <zsh-workers@zsh.org>
Subject: Recent curses module changes and Re: TRAPALRM / TMOUT oddity
MIME-version: 1.0
Content-type: text/plain; charset=us-ascii

On May 26, 10:14am, Peter Stephenson wrote:
}
} +	    if (selret < 0 && (errflag || retflag || breaks || exit_pending))
}  		break;

I suppose that means the following would be advisable?  Or is it perhaps
going too far?

Index: Src/Modules/curses.c
===================================================================
diff -c -r1.5 curses.c
--- Src/Modules/curses.c	6 May 2011 15:29:06 -0000	1.5
+++ Src/Modules/curses.c	27 May 2011 01:08:59 -0000
@@ -1106,7 +1106,7 @@
 
 #ifdef HAVE_WGET_WCH
     while ((ret = wget_wch(w->win, &wi)) == ERR) {
-	if (errno != EINTR)
+	if (errno != EINTR || errflag || retflag || breaks || exit_pending)
 	    break;
     }
     switch (ret) {
@@ -1132,7 +1132,7 @@
     }
 #else
     while ((ci = wgetch(w->win)) == ERR) {
-	if (errno != EINTR)
+	if (errno != EINTR || errflag || retflag || breaks || exit_pending)
 	    return 1;
     }
     if (ci >= 256) {