[Emacs-diffs] master a53b913: Fix double chars in NS port.

[Jan D.]

branch: master
commit a53b91322939c59ae0217aa6439f70b16463ae23
Author: Jan Djärv <address@hidden>
Commit: Jan Djärv <address@hidden>

    Fix double chars in NS port.
    
    Fixes: debbugs:19531
    
    * nsterm.m (EV_TRAILER2): Set Vinhibit_quit to Qt.
---
 src/ChangeLog |    4 ++++
 src/nsterm.m  |    3 +++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 6257cc4..a320e22 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-20  Jan Djärv  <address@hidden>
+
+       * nsterm.m (EV_TRAILER2): Set Vinhibit_quit to Qt (Bug#19531).
+
 2015-01-20  Dmitry Antipov  <address@hidden>
 
        Prefer xlispstrdup to avoid dumb calls to strlen.
diff --git a/src/nsterm.m b/src/nsterm.m
index b07fa1c..ee1268e 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);                                       \