[Emacs-diffs] /srv/bzr/emacs/trunk r109206: * nsterm.m (ns_read_socket): Return early if there is a modal window.

[Jan D.]

------------------------------------------------------------
revno: 109206
fixes bug: http://debbugs.gnu.org/12043
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Wed 2012-07-25 19:31:34 +0200
message:
  * nsterm.m (ns_read_socket): Return early if there is a modal window.
modified:
  src/ChangeLog
  src/nsterm.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-25 09:34:48 +0000
+++ b/src/ChangeLog     2012-07-25 17:31:34 +0000
@@ -1,3 +1,8 @@
+2012-07-25  Jan Djärv  <address@hidden>
+
+       * nsterm.m (ns_read_socket): Return early if there is a modal
+       window (Bug#12043).
+
 2012-07-25  Martin Rudalics  <address@hidden>
 
        * frame.c (Fredirect_frame_focus): In doc-string don't mention

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2012-07-21 12:10:49 +0000
+++ b/src/nsterm.m      2012-07-25 17:31:34 +0000
@@ -3411,6 +3411,9 @@
 
 /* NSTRACE (ns_read_socket); */
 
+  if ([NSApp modalWindow] != nil)
+    return -1;
+
   if (interrupt_input_blocked)
     {
       interrupt_input_pending = 1;