2 files changed, 6 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 06618a543e2..3a2a36c0cf7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,7 @@
 2013-03-16  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsterm.m (updateFrameSize:): Change resize increments if needed.
+        (ns_select): Don't return with result uninitialized.
 
         * nsterm.h (EmacsSavePanel, EmacsOpenPanel): Add getFilename
         and getDirectory.
diff --git a/src/nsterm.m b/src/nsterm.m
index be586010c81..40e506eab27 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3601,6 +3601,11 @@ ns_select (int nfds, fd_set *readfds, fd_set *writefds,
           result = t;
         }
     }
+  else
+    {
+      errno = EINTR;
+      result = -1;
+    }
 
   return result;
 }