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 07:52:28 +0100 Message-ID: <87zikl8leb.fsf@gmail.com> References: <874ms03qj1.fsf@web.de> <8360nxhfiw.fsf@gnu.org> <83k2ccfnh8.fsf@gnu.org> <83wpgbdy82.fsf@gnu.org> <87y4071o5k.fsf@gmail.com> <83h96u3d07.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1480229596 17312 195.159.176.226 (27 Nov 2016 06:53:16 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 27 Nov 2016 06:53:16 +0000 (UTC) User-Agent: mu4e 0.9.17; emacs 24.5.1 Cc: rrt@sc3d.org, 19547@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Nov 27 07:53:10 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 1cAtKo-00038q-1j for geb-bug-gnu-emacs@m.gmane.org; Sun, 27 Nov 2016 07:53:10 +0100 Original-Received: from localhost ([::1]:53099 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cAtKp-0007EC-KO for geb-bug-gnu-emacs@m.gmane.org; Sun, 27 Nov 2016 01:53:11 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40934) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cAtKj-0007E6-7z for bug-gnu-emacs@gnu.org; Sun, 27 Nov 2016 01:53:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cAtKg-0001aC-5T for bug-gnu-emacs@gnu.org; Sun, 27 Nov 2016 01:53:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:55684) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cAtKg-0001Zy-1y for bug-gnu-emacs@gnu.org; Sun, 27 Nov 2016 01:53:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cAtKf-0001Wj-Lx for bug-gnu-emacs@gnu.org; Sun, 27 Nov 2016 01:53:01 -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 06:53:01 +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.14802295605844 (code B ref 19547); Sun, 27 Nov 2016 06:53:01 +0000 Original-Received: (at 19547) by debbugs.gnu.org; 27 Nov 2016 06:52:40 +0000 Original-Received: from localhost ([127.0.0.1]:42850 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cAtKK-0001WB-IC for submit@debbugs.gnu.org; Sun, 27 Nov 2016 01:52:40 -0500 Original-Received: from mail-wm0-f53.google.com ([74.125.82.53]:35740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cAtKI-0001Vx-EJ for 19547@debbugs.gnu.org; Sun, 27 Nov 2016 01:52:38 -0500 Original-Received: by mail-wm0-f53.google.com with SMTP id a197so177401884wmd.0 for <19547@debbugs.gnu.org>; Sat, 26 Nov 2016 22:52:38 -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; bh=X6DFWQqG6o6OsIElp9eBshuOImu00AEaUs0ySCJqWok=; b=nWgJkM/EyYNBDnyKgZNYilXNee9yKwUcP4s3viZzR0cKsaQUoSjh7aAXZfExGnxD/d 03BBpw0icmyRNtUqClIARZvNiCS79/RFHSPexCnBh8at0jKi3AtPKmLQZ+7N6zeteqpw BvIRQ6pI5Nd1hh2pbLmjDulKNVEktJx5pictMJfbUH7ChnpOVJFtCkuMf0YRsBCP29nq wvXxSzp/bJWW9FTNDaK5tyLthd5kGS6qtxVdXYSZw0pBrpHR4KzVSUspDpEdGiEiChVO I+fAapdV64WYnXeRaftGD6Ij8QfihpNNNqw9Bz0FtycwcAG4jPDdW+z2V+C67KmQwPyA 7nXQ== 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; bh=X6DFWQqG6o6OsIElp9eBshuOImu00AEaUs0ySCJqWok=; b=Q3JgBz4xWoclAHqj4ZZgJmUcuyGZG6lrHic2Ipq0CMDM2sCTLnyGdhziQjA7hG4aMB tFr0NSOi8tkIPtk9fmdimenGYNee9Ea85PIDXX5Q8nVnhnwUfsbx9CHeNzqq6VFkiDE7 lgqf/gmTE3p9Wpj6JU3UqXwt2Y8o8LbwS5rDYBPcHmTbsyM8f7oJ/8nyZ00+va41fMTj 8SmA9ZJ+H5mzHAZhJICrGXhEK9c2EHrsRYleknq0thyXo0QnvKs86ZBxHaGDAkdzlAW9 nb3lIJ6BGB1PGoEUOUe8/3S/hICuNIcB1ent4vCsWqiyPFL+fOQH7BfjxRUupxRXzMhZ BwvQ== X-Gm-Message-State: AKaTC00bL2ZSlIB+y06cIolrW8wkOoAGrkyc7ctT/bP8iyrzgss3L5Y74YuKgGwtZdtC0g== X-Received: by 10.28.6.203 with SMTP id 194mr13526415wmg.16.1480229552437; Sat, 26 Nov 2016 22:52:32 -0800 (PST) Original-Received: from dell-14z ([37.165.55.141]) by smtp.gmail.com with ESMTPSA id pd2sm55652674wjb.31.2016.11.26.22.52.30 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Sat, 26 Nov 2016 22:52:31 -0800 (PST) In-reply-to: <83h96u3d07.fsf@gnu.org> 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:126150 Archived-At: Eli Zaretskii writes: > You can do that with a 'switch' in C, or, better, with a C array that > holds the symbols and their corresponding C event_kind values, like > this: > > struct event_value { > Lisp_Object event_symbol; > enum event_kind event_kind; > }; > static struct event_value symbol_to_kind[] = { > { Qfocus_in, FOCUS_IN_EVENT }, > { Qhelp, HELP_EVENT }, > { Qiconify, ICONIFY_EVENT }, > ... > }; > > Then, for each symbol, you can find the corresponding event value by > walking the array until you find a match. I finally wrote a patch for keyboard.c which is compiling without error, I used switch because I still not understanding how to use the code above (seems that is approach is too advanced for my skills compared to the usage of switch). The patch seems to work fine with helm, though i didn't test with our bug (https://github.com/emacs-helm/helm/issues/1157), but I now don't know where to initialize our variable (while-no-input-ignore-events), I just setq it in scratch buffer after starting helm with a minimal installation (script emacs-helm.sh). Here the patch (please look at it carefully this is the first C code I write): diff --git a/src/keyboard.c b/src/keyboard.c index 65938a5..3caf506 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -3567,14 +3567,22 @@ kbd_buffer_store_buffered_event (union buffered_input_event *event, #endif /* subprocesses */ } + Lisp_Object ignore_event; + + switch (event->kind) + { + case FOCUS_IN_EVENT: ignore_event = Qfocus_in; + case FOCUS_OUT_EVENT: ignore_event = Qfocus_out; + case HELP_EVENT: ignore_event = Qhelp; + case ICONIFY_EVENT: ignore_event = Qiconify; + case DEICONIFY_EVENT: ignore_event = Qdeiconify; + case SELECTION_REQUEST_EVENT: ignore_event = Qselection_request; + } + /* 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,12 @@ 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; + /* = listn (Qfocus_in, Qfocus_out, Qhelp, Qiconify, Qdeiconify, Qselection_request); */ } void Thanks. -- Thierry