Merge remote-tracking branch 'savannah/master' into HEAD

1 files changed, 0 insertions, 13 deletions

diff --git a/src/process.c b/src/process.c
index 91d426103d8..e4e5e57aeee 100644
--- a/src/process.c
+++ b/src/process.c
@@ -8277,19 +8277,6 @@ init_process_emacs (int sockfd)
   memset (datagram_address, 0, sizeof datagram_address);
 #endif
 
-#if defined (DARWIN_OS)
-  /* PTYs are broken on Darwin < 6, but are sometimes useful for interactive
-     processes.  As such, we only change the default value.  */
- if (initialized)
-  {
-    char const *release = (STRINGP (Voperating_system_release)
-                           ? SSDATA (Voperating_system_release)
-                           : 0);
-    if (!release || !release[0] || (release[0] < '7' && release[1] == '.')) {
-      Vprocess_connection_type = Qnil;
-    }
-  }
-#endif
 #endif  /* subprocesses */
   kbd_is_on_hold = 0;
 }