diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2012-07-25 19:31:34 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2012-07-25 19:31:34 +0200 |
| commit | 57ec30344f904155e4e8adfe823250de8e168463 (patch) | |
| tree | d8893ca3d91e7857b8bcde3fa9077dc6d1a71024 | |
| parent | 67ada220af08d704fa30196ea5b8660dc088b832 (diff) | |
| download | emacs-57ec30344f904155e4e8adfe823250de8e168463.tar.gz | |
* nsterm.m (ns_read_socket): Return early if there is a modal window.
Fixes: debbugs:12043
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/nsterm.m | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1e9e65192f7..700ff294c83 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-07-25 Jan Djärv <jan.h.d@swipnet.se> + + * nsterm.m (ns_read_socket): Return early if there is a modal + window (Bug#12043). + 2012-07-25 Martin Rudalics <rudalics@gmx.at> * frame.c (Fredirect_frame_focus): In doc-string don't mention diff --git a/src/nsterm.m b/src/nsterm.m index e018ea34910..1f06d49c5b9 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -3411,6 +3411,9 @@ ns_read_socket (struct terminal *terminal, int expected, /* NSTRACE (ns_read_socket); */ + if ([NSApp modalWindow] != nil) + return -1; + if (interrupt_input_blocked) { interrupt_input_pending = 1; |