master fails to build on macOS

master fails to build on macOS

[John Wiegley]

I'm seeing this after pulling just now:

--8<---------------cut here---------------start------------->8---
builder for '/nix/store/vwpdsg0sw2nwxr186jhxagvja436pm02-emacs-27.0.50.drv' failed with exit code 2; last 10 log lines:
  keyboard.c:5466:11: error: use of undeclared identifier 'used_mouse_menu'
        if (used_mouse_menu)
            ^
  keyboard.c:5467:10: error: use of undeclared identifier 'used_mouse_menu'
          *used_mouse_menu = true;
           ^
  2 errors generated.
  make[1]: *** [Makefile:381: keyboard.o] Error 1
  make[1]: Leaving directory '/private/tmp/nix-build-emacs-27.0.50.drv-0/master/src'
  make: *** [Makefile:418: src] Error 2
--8<---------------cut here---------------end--------------->8---

-- 
John Wiegley                  GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com                          60E1 46C4 BD1A 7AC1 4BA2

Re: master fails to build on macOS

[Paul Eggert]

[-- Attachment #1: Type: text/plain, Size: 219 bytes --]

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.

[-- Attachment #2: 0001-Fix-macOS-breakage-in-make_lispy_event.patch --]
[-- Type: text/x-patch, Size: 1233 bytes --]

From 747a2f061e13fe1584babbb4ae458559be479817 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
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

Re: master fails to build on macOS

[Stefan Monnier]

>>    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.

Thanks.  I actually committed the same patch yesterday, but according to
evidence I failed to push it.


        Stefan