From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-36376-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 21389 invoked by alias); 1 Sep 2015 18:15:10 -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: 36376
Received: (qmail 9363 invoked from network); 1 Sep 2015 18:15:09 -0000
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham
	autolearn_force=no version=3.4.0
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20130820;
        h=x-gm-message-state:from:message-id:date:in-reply-to:comments
         :references:to:subject:mime-version:content-type;
        bh=/j5N7tuyGbxPtCdcFhzfzZdtjx0Y2ZbsDP74/3PZWgk=;
        b=EsENh/gnci3UPX9DDNZCVdLAKraSOaTCyg3mEOgl9Wl4CwxsepCpI9MFHnnhWwkB4g
         XH3L1i9kRVRSp2b83Wc4ztn6rppm13ktBjHhIAfppZtnn/BxWrtUb6c2vSxQEN8N6hRa
         /7kAtE//CTVSAN5EPbUp8swjX1kk3HRq1nx4eQhcbPQ/BwPcvw9WjHclMIxE4JphRnRk
         afZdGCJ3gjZGpXRO7ugDdVWMdvge5vigC5zGhegwwP8Bole8kJLoP85x9/8HoDNdaIF0
         wxoSR+pTIQthCmHYxgqpkpiuszCPdXANkewBud8aKez8PFsYVI5Y+T4UHrsLDMht2ijR
         k96w==
X-Gm-Message-State: ALoCoQnEO1U4cCm/SEX+NNuXHdRyKOnykgYJI1Nr+eJcp+fCm47R7vJOPIo+CbT1zUCQgAVRR01q
X-Received: by 10.60.81.69 with SMTP id y5mr12458468oex.30.1441131305860;
        Tue, 01 Sep 2015 11:15:05 -0700 (PDT)
From: Bart Schaefer <schaefer@brasslantern.com>
Message-Id: <150901111502.ZM2072@torch.brasslantern.com>
Date: Tue, 1 Sep 2015 11:15:02 -0700
In-Reply-To: <20150901141031.GB423@x4>
Comments: In reply to Markus Trippelsdorf <markus@trippelsdorf.de>
        "Ctrl-c not working during correction with 5.1" (Sep  1,  4:10pm)
References: <20150901141031.GB423@x4>
X-Mailer: OpenZMail Classic (0.9.2 24April2005)
To: zsh-workers@zsh.org
Subject: Re: Ctrl-c not working during correction with 5.1
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii

On Sep 1,  4:10pm, Markus Trippelsdorf wrote:
}
} I cannot abort a correction with Ctrl-c anymore, e.g.:
} 
} markus@x4 tmp % la
} zsh: correct 'la' to 'lz' [nyae]? <press Ctrl-c and nothing happens>

Unintended side-effect of all the race-condition-prevention work that
went on this summer.

diff --git a/Src/utils.c b/Src/utils.c
index 4c4dc55..90f7c33 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -2538,11 +2538,16 @@ static int
 read1char(int echo)
 {
     char c;
+    int q = queue_signal_level();
 
+    dont_queue_signals();
     while (read(SHTTY, &c, 1) != 1) {
-	if (errno != EINTR || errflag || retflag || breaks || contflag)
+	if (errno != EINTR || errflag || retflag || breaks || contflag) {
+	    restore_queue_signals(q);
 	    return -1;
+	}
     }
+    restore_queue_signals(q);
     if (echo)
 	write_loop(SHTTY, &c, 1);
     return STOUC(c);

-- 
Barton E. Schaefer