procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Backport from trunk of bug 19531.

Browse source 
Fixes: debbugs:19531

* nsterm.m (EV_TRAILER2): Set Vinhibit_quit to Qt.
This commit is contained in:
Jan D 2015-01-21 06:18:59 +01:00
parent 24aacfc905
commit 87309740ca
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
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

3
src/nsterm.m
View file

@ -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); \