From: Jan D <jan.h.d@swipnet.se>
Date: Wed, 21 Jan 2015 05:18:59 +0000 (+0100)
Subject: Backport from trunk of bug 19531.
X-Git-Tag: emacs-24.4.90~46
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=87309740ca4fd2b2bc61d2a4599765a2571e18f6;p=emacs.git

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 ad4a85ae487..709fd505af7 100644
--- 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 9ba08522309..24770f6dd10 100644
--- 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);                                       \