* editfns.c (Voperating_system_release): Added.

	(init_editfns): Assign new variable operating-system-release
	based on call to uname if available.
	(get_operating_system_release): Added function to
	allow c-level access to operating system release.
* config.h: Regenerated.
* s/darwin.h (PTY_ITERATION): Don't allow PTYs on darwin 6 or
	less.
	(MIN_PTY_KERNEL_VERSION): Defined minimum kernel version for
	using ptys as '7'.
* term/mac-win.el (process-connection-type): Removed.
	Controlled now by s/darwin.h:PTY_ITERATION.

3 files changed, 40 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d69409965f1..4b33af4bc4a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
+2005-01-20  Steven Tamm  <steventamm@mac.com>
+
+        * editfns.c (Voperating_system_release): Added.
+        (init_editfns): Assign new variable operating-system-release
+        based on call to uname if available.
+        (get_operating_system_release): Added function to
+        allow c-level access to operating system release.       
+
+        * config.h: Regenerated.
+
+        * s/darwin.h (PTY_ITERATION): Don't allow PTYs on darwin 6 or
+        less.
+        (MIN_PTY_KERNEL_VERSION): Defined minimum kernel version for
+        using ptys as '7'.
+
 2005-01-20  Kim F. Storm  <storm@cua.dk>
 
         * alloc.c (STRING_MARKED_P, VECTOR_MARKED_P): Return boolean.
diff --git a/src/editfns.c b/src/editfns.c
index 6641c990a4f..a6cd2c0e16b 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1364,6 +1364,15 @@ get_system_name ()
     return "";
 }
 
+char *
+get_operating_system_release()
+{
+  if (STRINGP (Voperating_system_release))
+    return (char *) SDATA (Voperating_system_release);
+  else
+    return "";
+}
+
 DEFUN ("emacs-pid", Femacs_pid, Semacs_pid, 0, 0, 0,
        doc: /* Return the process ID of Emacs, as an integer.  */)
      ()
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 9f78405a43c..d8da3e3174c 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -107,6 +107,22 @@ Boston, MA 02111-1307, USA.  */
 
 #define HAVE_PTYS
 
+
+/*
+ * PTYs only work correctly on Darwin 7 or higher.  So make PTY_ITERATION
+ * Test the operating system release and only allow PTYs if it is greater
+ * than 7.
+ */
+#define MIN_PTY_KERNEL_VERSION '7' 
+#define PTY_ITERATION  \
+  char *release = get_operating_system_release();       \
+  if (!release || !release[0] || (release[0] < MIN_PTY_KERNEL_VERSION \
+                                  && release[1] == '.'))              \
+    return -1; \
+  for (c = FIRST_PTY_LETTER; c <= 'z'; c++)     \
+    for (i = 0; i < 16; i++)
+
+
 /*
  *      Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate
  *      The 4.2 opendir, etc., library functions.