From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Thierry Volpiatto Newsgroups: gmane.emacs.bugs Subject: bug#19547: Patch for this bug Date: Sun, 27 Nov 2016 19:29:49 +0100 Message-ID: <87polgwzc2.fsf@gmail.com> References: <874ms03qj1.fsf@web.de> <8360nxhfiw.fsf@gnu.org> <83k2ccfnh8.fsf@gnu.org> <83wpgbdy82.fsf@gnu.org> <87y4071o5k.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: blaine.gmane.org 1480271420 32256 195.159.176.226 (27 Nov 2016 18:30:20 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 27 Nov 2016 18:30:20 +0000 (UTC) User-Agent: mu4e 0.9.17; emacs 24.5.1 Cc: 19547@debbugs.gnu.org To: Reuben Thomas Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Nov 27 19:30:15 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cB4DO-0007So-Cy for geb-bug-gnu-emacs@m.gmane.org; Sun, 27 Nov 2016 19:30:14 +0100 Original-Received: from localhost ([::1]:55175 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cB4DS-0005Oa-1F for geb-bug-gnu-emacs@m.gmane.org; Sun, 27 Nov 2016 13:30:18 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47429) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cB4DH-0005Kv-TZ for bug-gnu-emacs@gnu.org; Sun, 27 Nov 2016 13:30:12 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cB4DD-0007Ze-A8 for bug-gnu-emacs@gnu.org; Sun, 27 Nov 2016 13:30:07 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:56651) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cB4DD-0007ZY-71 for bug-gnu-emacs@gnu.org; Sun, 27 Nov 2016 13:30:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cB4DC-0006jZ-Tr for bug-gnu-emacs@gnu.org; Sun, 27 Nov 2016 13:30:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Thierry Volpiatto Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 27 Nov 2016 18:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19547 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 19547-submit@debbugs.gnu.org id=B19547.148027140225874 (code B ref 19547); Sun, 27 Nov 2016 18:30:02 +0000 Original-Received: (at 19547) by debbugs.gnu.org; 27 Nov 2016 18:30:02 +0000 Original-Received: from localhost ([127.0.0.1]:43817 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cB4DB-0006j0-CV for submit@debbugs.gnu.org; Sun, 27 Nov 2016 13:30:01 -0500 Original-Received: from mail-wm0-f54.google.com ([74.125.82.54]:36101) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cB4D9-0006ik-Hb for 19547@debbugs.gnu.org; Sun, 27 Nov 2016 13:29:59 -0500 Original-Received: by mail-wm0-f54.google.com with SMTP id g23so186464166wme.1 for <19547@debbugs.gnu.org>; Sun, 27 Nov 2016 10:29:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version:content-transfer-encoding; bh=gKWOUD6XjtwqppozBTYANeWIxBL3UIBPhMoNMMdrl54=; b=CdDPuIbfa4nlVKtwyQrwcribWewyP1S5KZu5rtb1677YyO0KlFcMb6GNDTS7adHbzs C7QBZSxu9EKHe+r8lME36WFBiXwsAhWsFhyeeT0ShXy5Vdb6Fo+BhHJMYYPMNvmdJUaA 7KVuqZjrfrpkZKF/bXXOgtvwW1L5D8A9dDtvowaVHp2p3ZK5iVlRfRPRgGn1dqdpjvWK RUyn57io+aIcaYglasm7vZJUnjo+8RKp6hHJ1XSwhWl9GkxeM+uP/N5ulPmcBKOiS+Sp AEq1QWutRF8+0/BE0HK6qOdWEFiZ8GDFlWss7JLfQL7KI+9JhzRxY6Qwp2DKhPiWmusy XIBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version:content-transfer-encoding; bh=gKWOUD6XjtwqppozBTYANeWIxBL3UIBPhMoNMMdrl54=; b=Jl/JtygQuZ8EPgg7lw1WYwPQjo/IVpucXBa51xg68uLNZiauCnn5/iNYZiyjaYRdJn 7V0fJiLhHo6J1Pmjcj8l+mc60efu7qyc4/NoB6gpgZrhFIp8Evscb66dWgoz4Wx5aRD/ xgvTJswZqAPWNIlLvh1O/kh63qXP0y4xrxqc6zNNlmXc4S7gSdN2f+P/wYSuBPNzN2zy 1bsd76I0j51nYzFN45121+movdSuWQbIKsZfrxhYxfGYCZYZpQDxj7ZIeJQixq6ReJa8 2UnjTI/msih1lcfG9b7IbHzTpEgSf9WbvOf+677UAL6BMwxQys9xsRhbf5bEWk6gI3Oc oUaQ== X-Gm-Message-State: AKaTC02ZJAXZfp6nRXYgrOCtIwFbtpUjfSeEfDIMlJ5H+e1+9xjhl81wKJRCfswkCOP0Dw== X-Received: by 10.28.208.203 with SMTP id h194mr15526687wmg.45.1480271393714; Sun, 27 Nov 2016 10:29:53 -0800 (PST) Original-Received: from dell-14z ([37.167.8.218]) by smtp.gmail.com with ESMTPSA id 138sm24725331wms.20.2016.11.27.10.29.52 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Sun, 27 Nov 2016 10:29:53 -0800 (PST) In-reply-to: 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: 208.118.235.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:126178 Archived-At: Reuben Thomas writes: > ​This was still on my to-do list, but thanks very much, Thierry, for taking > over.​ You are welcome ;-) Don't hesitate to correct my poor C code, thanks. So here the final patch I could push if Eli is ok after looking the comments in previous mail; I had prefered also adding the changes to simple.el in same commit when i know how to do, basically it is just how/where to add: (setq while-no-input-ignore-events '(focus-in focus-out help iconify deiconify selection-request)) Here the last patch: 1 file changed, 22 insertions(+), 5 deletions(-) src/keyboard.c | 27 ++++++++++++++++++++++----- modified src/keyboard.c @@ -3567,14 +3567,22 @@ kbd_buffer_store_buffered_event (union buffered_input_event *event, #endif /* subprocesses */ } + Lisp_Object ignore_event = Qnil; + + switch (event->kind) + { + case FOCUS_IN_EVENT: ignore_event = Qfocus_in; break; + case FOCUS_OUT_EVENT: ignore_event = Qfocus_out; break; + case HELP_EVENT: ignore_event = Qhelp; break; + case ICONIFY_EVENT: ignore_event = Qiconify; break; + case DEICONIFY_EVENT: ignore_event = Qdeiconify; break; + case SELECTION_REQUEST_EVENT: ignore_event = Qselection_request; break; + } + /* If we're inside while-no-input, and this event qualifies as input, set quit-flag to cause an interrupt. */ if (!NILP (Vthrow_on_input) - && event->kind != FOCUS_IN_EVENT - && event->kind != FOCUS_OUT_EVENT - && event->kind != HELP_EVENT - && event->kind != ICONIFY_EVENT - && event->kind != DEICONIFY_EVENT) + && !NILP (Fmemq (ignore_event, Vwhile_no_input_ignore_events))) { Vquit_flag = Vthrow_on_input; /* If we're inside a function that wants immediate quits, @@ -11164,6 +11172,10 @@ syms_of_keyboard (void) DEFSYM (Qiconify_frame, "iconify-frame"); DEFSYM (Qmake_frame_visible, "make-frame-visible"); DEFSYM (Qselect_window, "select-window"); + DEFSYM (Qhelp, "help"); + DEFSYM (Qiconify, "iconify"); + DEFSYM (Qdeiconify, "deiconify"); + DEFSYM (Qselection_request, "selection-request"); { int i; @@ -11822,6 +11834,11 @@ signals. */); /* Create the initial keyboard. Qt means 'unset'. */ initial_kboard = allocate_kboard (Qt); + + DEFVAR_LISP ("while-no-input-ignore-events", + Vwhile_no_input_ignore_events, + doc: /* Ignored events from while-no-input. */); + Vwhile_no_input_ignore_events = Qnil; } void -- Thierry