Backport from trunk of bug 19531.

Fixes: debbugs:19531
* nsterm.m (EV_TRAILER2): Set Vinhibit_quit to Qt.

diff --git a/src/ChangeLog b/src/ChangeLog
index ad4a85ae487c7829b55e5d97a465035b29dc903d..709fd505af7c5273e441eed06694a9d9d28b52af 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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

diff --git a/src/nsterm.m b/src/nsterm.m
index 9ba08522309d37ba520ce1eaee99ea74e6a1a4a2..24770f6dd10e8f9afd639fef51062dbd8e3f571d 100644 (file)
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -378,8 +378,11 @@ static CGPoint menu_mouse_point;
       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);                                       \