diff options
| author | Jan D <jan.h.d@swipnet.se> | 2015-01-21 06:18:59 +0100 |
|---|---|---|
| committer | Jan D <jan.h.d@swipnet.se> | 2015-01-21 06:18:59 +0100 |
| commit | 87309740ca4fd2b2bc61d2a4599765a2571e18f6 (patch) | |
| tree | 85ebb266e67aebe9ace6b48635da4095ab9180ca | |
| parent | 24aacfc9058dfff1331a64f50ced2ca4d6f25824 (diff) | |
| download | emacs-87309740ca4fd2b2bc61d2a4599765a2571e18f6.tar.gz | |
Backport from trunk of bug 19531.
Fixes: debbugs:19531
* nsterm.m (EV_TRAILER2): Set Vinhibit_quit to Qt.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/nsterm.m | 3 |
2 files changed, 7 insertions, 0 deletions
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); \ |