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 6257cc4277a5853e74e07e85e81486e92999a312..a320e22c65ced621e0dc78e2c52fd987bc87b469 100644 (file)
--- 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 b07fa1c31b00b479be05c33f6db8513f9b8f19a6..ee1268ef8506ccf9bf54fe9a8c627e80a6db4243 100644 (file)
--- 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);                                       \