From: Paul Eggert <eggert@cs.ucla.edu>
To: emacs-devel@gnu.org
Subject: Re: master fails to build on macOS
Date: Mon, 15 Jan 2018 17:21:55 -0800 [thread overview]
Message-ID: <54472a37-30fa-1c0d-9de0-7edacb789622@cs.ucla.edu> (raw)
In-Reply-To: <m27esivh83.fsf@newartisans.com>
[-- 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
next prev parent reply other threads:[~2018-01-16 1:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-15 23:23 master fails to build on macOS John Wiegley
2018-01-16 1:21 ` Paul Eggert [this message]
2018-01-16 1:37 ` Stefan Monnier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54472a37-30fa-1c0d-9de0-7edacb789622@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.