diff options
| author | Jan D | 2015-01-21 06:18:59 +0100 |
|---|---|---|
| committer | Jan D | 2015-01-21 06:18:59 +0100 |
| commit | 87309740ca4fd2b2bc61d2a4599765a2571e18f6 (patch) | |
| tree | 85ebb266e67aebe9ace6b48635da4095ab9180ca /src/nsterm.m | |
| parent | 24aacfc9058dfff1331a64f50ced2ca4d6f25824 (diff) | |
| download | emacs-87309740ca4fd2b2bc61d2a4599765a2571e18f6.tar.gz emacs-87309740ca4fd2b2bc61d2a4599765a2571e18f6.zip | |
Backport from trunk of bug 19531.
Fixes: debbugs:19531
* nsterm.m (EV_TRAILER2): Set Vinhibit_quit to Qt.
Diffstat (limited to 'src/nsterm.m')
| -rw-r--r-- | src/nsterm.m | 3 |
1 files changed, 3 insertions, 0 deletions
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; | |||
| 378 | if (e) emacs_event->timestamp = EV_TIMESTAMP (e); \ | 378 | if (e) emacs_event->timestamp = EV_TIMESTAMP (e); \ |
| 379 | if (q_event_ptr) \ | 379 | if (q_event_ptr) \ |
| 380 | { \ | 380 | { \ |
| 381 | Lisp_Object tem = Vinhibit_quit; \ | ||
| 382 | Vinhibit_quit = Qt; \ | ||
| 381 | n_emacs_events_pending++; \ | 383 | n_emacs_events_pending++; \ |
| 382 | kbd_buffer_store_event_hold (emacs_event, q_event_ptr); \ | 384 | kbd_buffer_store_event_hold (emacs_event, q_event_ptr); \ |
| 385 | Vinhibit_quit = tem; \ | ||
| 383 | } \ | 386 | } \ |
| 384 | else \ | 387 | else \ |
| 385 | hold_event (emacs_event); \ | 388 | hold_event (emacs_event); \ |