aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2018-01-15 17:18:42 -0800
committerPaul Eggert2018-01-15 17:19:09 -0800
commit9f22b7d2317eff65897355dcf68ba10d521cfa5a (patch)
tree3f4dc358802c4f5fcb32327f83008bc94fc71cf8 /src
parent81b5131e11fa96d32a1718c6e2ebf40994d7d281 (diff)
downloademacs-9f22b7d2317eff65897355dcf68ba10d521cfa5a.tar.gz
emacs-9f22b7d2317eff65897355dcf68ba10d521cfa5a.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 64ad8b2c8fa..75fbe459b2b 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3907,6 +3907,9 @@ kbd_buffer_get_event (KBOARD **kbp,
3907#endif 3907#endif
3908#if defined (HAVE_NS) 3908#if defined (HAVE_NS)
3909 case NS_TEXT_EVENT: 3909 case NS_TEXT_EVENT:
3910 if (used_mouse_menu)
3911 *used_mouse_menu = true;
3912 FALLTHROUGH;
3910#endif 3913#endif
3911#ifdef HAVE_NTGUI 3914#ifdef HAVE_NTGUI
3912 case END_SESSION_EVENT: 3915 case END_SESSION_EVENT:
@@ -5463,8 +5466,6 @@ make_lispy_event (struct input_event *event)
5463 5466
5464#ifdef HAVE_NS 5467#ifdef HAVE_NS
5465 case NS_TEXT_EVENT: 5468 case NS_TEXT_EVENT:
5466 if (used_mouse_menu)
5467 *used_mouse_menu = true;
5468 return list1 (intern (event->code == KEY_NS_PUT_WORKING_TEXT 5469 return list1 (intern (event->code == KEY_NS_PUT_WORKING_TEXT
5469 ? "ns-put-working-text" 5470 ? "ns-put-working-text"
5470 : "ns-unput-working-text")); 5471 : "ns-unput-working-text"));