From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#34535: 27.0.50; emacs -nw: while-no-input + sit-for + => Quit Date: Fri, 22 Feb 2019 18:08:58 +0200 Message-ID: <83k1hrrejp.fsf@gnu.org> References: <87r2c4ennz.fsf@web.de> Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="91169"; mail-complaints-to="usenet@blaine.gmane.org" Cc: 34535@debbugs.gnu.org To: Michael Heerdegen , Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Feb 22 17:10:13 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1gxDOu-000NbP-1I for geb-bug-gnu-emacs@m.gmane.org; Fri, 22 Feb 2019 17:10:12 +0100 Original-Received: from localhost ([127.0.0.1]:53536 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxDOs-0002ST-Dz for geb-bug-gnu-emacs@m.gmane.org; Fri, 22 Feb 2019 11:10:10 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:41912) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxDOn-0002SK-77 for bug-gnu-emacs@gnu.org; Fri, 22 Feb 2019 11:10:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxDOl-0000ps-Ar for bug-gnu-emacs@gnu.org; Fri, 22 Feb 2019 11:10:05 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:34969) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gxDOk-0000oo-3p for bug-gnu-emacs@gnu.org; Fri, 22 Feb 2019 11:10:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gxDOj-0008Pi-P1 for bug-gnu-emacs@gnu.org; Fri, 22 Feb 2019 11:10:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 22 Feb 2019 16:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34535 X-GNU-PR-Package: emacs Original-Received: via spool by 34535-submit@debbugs.gnu.org id=B34535.155085174732261 (code B ref 34535); Fri, 22 Feb 2019 16:10:01 +0000 Original-Received: (at 34535) by debbugs.gnu.org; 22 Feb 2019 16:09:07 +0000 Original-Received: from localhost ([127.0.0.1]:48511 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gxDNq-0008OH-N9 for submit@debbugs.gnu.org; Fri, 22 Feb 2019 11:09:06 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:55353) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gxDNo-0008Nm-3L for 34535@debbugs.gnu.org; Fri, 22 Feb 2019 11:09:04 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:59929) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxDNi-0008LM-Dz; Fri, 22 Feb 2019 11:08:58 -0500 Original-Received: from [176.228.60.248] (port=1155 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1gxDNh-0006Ym-Cg; Fri, 22 Feb 2019 11:08:58 -0500 In-reply-to: <87r2c4ennz.fsf@web.de> (message from Michael Heerdegen on Mon, 18 Feb 2019 23:29:04 +0100) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:155650 Archived-At: > From: Michael Heerdegen > Date: Mon, 18 Feb 2019 23:29:04 +0100 > > in emacs -nw -Q eval in any way > > (while-no-input (sit-for 20)) > > and hit any key before the sit-for terminates. This always gives me a > Quit. That should not happen. On the emacs-26 branch, we have bug#31692, so this cannot work correctly there. That bug is fixed on master, though. What happens on master is this: when sit-for is called inside while-no-input on a TTY, it returns the cons cell (t . ?\C-g), which then causes keyboard quit right after while-no-input returns. The below seems to fix the problem, but I hope you also have a more complex real-life use case, because I'm not really sure this solution has no adverse effects elsewhere. Stefan, any thoughts? diff --git a/src/keyboard.c b/src/keyboard.c index 1d67c3e..4448e2b 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -2551,7 +2551,10 @@ read_char (int commandflag, Lisp_Object map, restore_getcjmp (save_jump); pthread_sigmask (SIG_SETMASK, &empty_mask, 0); unbind_to (jmpcount, Qnil); - XSETINT (c, quit_char); + /* If we are in while-no-input, don't trigger C-g, as that will + quit instead of letting while-no-input do its thing. */ + if (!EQ (Vquit_flag, Vthrow_on_input)) + XSETINT (c, quit_char); internal_last_event_frame = selected_frame; Vlast_event_frame = internal_last_event_frame; /* If we report the quit char as an event,