Commit 87309740 authored by Jan D's avatar Jan D

Backport from trunk of bug 19531.

Fixes: debbugs:19531

* nsterm.m (EV_TRAILER2): Set Vinhibit_quit to Qt.
parent 24aacfc9
2015-01-21 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (EV_TRAILER2): Set Vinhibit_quit to Qt (Bug#19531).
2015-01-17 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (produce_image_glyph): Fix display of images in R2L
......
......@@ -378,8 +378,11 @@ - (NSColor *)colorUsingDefaultColorSpace
if (e) emacs_event->timestamp = EV_TIMESTAMP (e); \
if (q_event_ptr) \
{ \
Lisp_Object tem = Vinhibit_quit; \
Vinhibit_quit = Qt; \
n_emacs_events_pending++; \
kbd_buffer_store_event_hold (emacs_event, q_event_ptr); \
Vinhibit_quit = tem; \
} \
else \
hold_event (emacs_event); \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment