From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: master fails to build on macOS Date: Mon, 15 Jan 2018 17:21:55 -0800 Organization: UCLA Computer Science Department Message-ID: <54472a37-30fa-1c0d-9de0-7edacb789622@cs.ucla.edu> References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------A0F0F1FA23796A2255E6B8B5" X-Trace: blaine.gmane.org 1516065614 19223 195.159.176.226 (16 Jan 2018 01:20:14 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 16 Jan 2018 01:20:14 +0000 (UTC) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 16 02:20:10 2018 Return-path: Envelope-to: ged-emacs-devel@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 1ebFv5-0004Qn-Jo for ged-emacs-devel@m.gmane.org; Tue, 16 Jan 2018 02:20:07 +0100 Original-Received: from localhost ([::1]:51028 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebFx5-000193-1E for ged-emacs-devel@m.gmane.org; Mon, 15 Jan 2018 20:22:11 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36495) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebFwx-00018V-5S for emacs-devel@gnu.org; Mon, 15 Jan 2018 20:22:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebFwt-0006E2-3O for emacs-devel@gnu.org; Mon, 15 Jan 2018 20:22:03 -0500 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:35864) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ebFws-0006BJ-Sf for emacs-devel@gnu.org; Mon, 15 Jan 2018 20:21:59 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 482FA16161A for ; Mon, 15 Jan 2018 17:21:57 -0800 (PST) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id kVxW6P_CTDtM for ; Mon, 15 Jan 2018 17:21:56 -0800 (PST) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 33DA116161D for ; Mon, 15 Jan 2018 17:21:56 -0800 (PST) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id hW9K7E-pHyut for ; Mon, 15 Jan 2018 17:21:56 -0800 (PST) Original-Received: from [192.168.1.9] (unknown [47.154.30.119]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 15EDF16161A for ; Mon, 15 Jan 2018 17:21:56 -0800 (PST) In-Reply-To: Content-Language: en-US X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 131.179.128.68 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:221997 Archived-At: This is a multi-part message in MIME format. --------------A0F0F1FA23796A2255E6B8B5 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit John Wiegley wrote: > keyboard.c:5466:11: error: use of undeclared identifier 'used_mouse_menu' I installed the attached seemingly-obvious fix. I don't use macOS, though, so another pair of eyes would be helpful. --------------A0F0F1FA23796A2255E6B8B5 Content-Type: text/x-patch; name="0001-Fix-macOS-breakage-in-make_lispy_event.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Fix-macOS-breakage-in-make_lispy_event.patch" >From 747a2f061e13fe1584babbb4ae458559be479817 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 15 Jan 2018 17:18:42 -0800 Subject: [PATCH] Fix macOS breakage in make_lispy_event Problem reported by John Wiegley in: https://lists.gnu.org/r/emacs-devel/2018-01/msg00499.html * src/keyboard.c (kbd_buffer_get_event) [HAVE_NS]: Act on used_mouse_menu here... (make_lispy_event) [HAVE_NS]: ... instead of here. --- src/keyboard.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/keyboard.c b/src/keyboard.c index 64ad8b2..75fbe45 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -3907,6 +3907,9 @@ kbd_buffer_get_event (KBOARD **kbp, #endif #if defined (HAVE_NS) case NS_TEXT_EVENT: + if (used_mouse_menu) + *used_mouse_menu = true; + FALLTHROUGH; #endif #ifdef HAVE_NTGUI case END_SESSION_EVENT: @@ -5463,8 +5466,6 @@ make_lispy_event (struct input_event *event) #ifdef HAVE_NS case NS_TEXT_EVENT: - if (used_mouse_menu) - *used_mouse_menu = true; return list1 (intern (event->code == KEY_NS_PUT_WORKING_TEXT ? "ns-put-working-text" : "ns-unput-working-text")); -- 2.7.4 --------------A0F0F1FA23796A2255E6B8B5--