[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 8730974: Backport from trunk of bug 19531.
From: |
Jan D. |
Subject: |
[Emacs-diffs] emacs-24 8730974: Backport from trunk of bug 19531. |
Date: |
Wed, 21 Jan 2015 05:19:13 +0000 |
branch: emacs-24
commit 87309740ca4fd2b2bc61d2a4599765a2571e18f6
Author: Jan D <address@hidden>
Commit: Jan D <address@hidden>
Backport from trunk of bug 19531.
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 ad4a85a..709fd50 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-21 Jan Djärv <address@hidden>
+
+ * nsterm.m (EV_TRAILER2): Set Vinhibit_quit to Qt (Bug#19531).
+
2015-01-17 Eli Zaretskii <address@hidden>
* xdisp.c (produce_image_glyph): Fix display of images in R2L
diff --git a/src/nsterm.m b/src/nsterm.m
index 9ba0852..24770f6 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); \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 8730974: Backport from trunk of bug 19531.,
Jan D. <=