From: Jan Djärv <jan.h.d@swipnet.se>
Date: Tue, 20 Jan 2015 16:22:14 +0000 (+0100)
Subject: Fix double chars in NS port.
X-Git-Tag: emacs-25.0.90~2592^2~4
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a53b91322939c59ae0217aa6439f70b16463ae23;p=emacs.git

Fix double chars in NS port.

Fixes: debbugs:19531

* nsterm.m (EV_TRAILER2): Set Vinhibit_quit to Qt.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 6257cc4277a..a320e22c65c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-20  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* nsterm.m (EV_TRAILER2): Set Vinhibit_quit to Qt (Bug#19531).
+
 2015-01-20  Dmitry Antipov  <dmantipov@yandex.ru>
 
 	Prefer xlispstrdup to avoid dumb calls to strlen.
diff --git a/src/nsterm.m b/src/nsterm.m
index b07fa1c31b0..ee1268ef850 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -373,8 +373,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);                                       \