# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 829098012 0
# Node ID 1351c75bc3d6995056c81385f4183b7d1f5c5ace
# Parent  5c431b2e0f957f505d489719812c5bfc211d0d99
(main) [MSDOS]: Handle DJGPP version 2.

diff -r 5c431b2e0f95 -r 1351c75bc3d6 lib-src/b2m.c
--- a/lib-src/b2m.c	Wed Apr 10 00:53:52 1996 +0000
+++ b/lib-src/b2m.c	Wed Apr 10 01:00:12 1996 +0000
@@ -89,8 +89,15 @@
 
 #ifdef MSDOS
   _fmode = O_BINARY;		/* all of files are treated as binary files */
+#if __DJGPP__ > 1
+  if (!isatty (fileno (stdout)))
+    setmode (fileno (stdout), O_BINARY);
+  if (!isatty (fileno (stdin)))
+    setmode (fileno (stdin), O_BINARY);
+#else /* not __DJGPP__ > 1 */
   (stdout)->_flag &= ~_IOTEXT;
   (stdin)->_flag &= ~_IOTEXT;
+#endif /* not __DJGPP__ > 1 */
 #endif
   progname = argv[0];
 
diff -r 5c431b2e0f95 -r 1351c75bc3d6 src/emacs.c
--- a/src/emacs.c	Wed Apr 10 00:53:52 1996 +0000
+++ b/src/emacs.c	Wed Apr 10 01:00:12 1996 +0000
@@ -532,9 +532,20 @@
   /* We do all file input/output as binary files.  When we need to translate
      newlines, we do that manually.  */
   _fmode = O_BINARY;
+
+#if __DJGPP__ >= 2
+  if (!isatty (fileno (stdin)))
+    setmode (fileno (stdin), O_BINARY);
+  if (!isatty (fileno (stdout)))
+    {
+      fflush (stdout);
+      setmode (fileno (stdout), O_BINARY);
+    }
+#else  /* not __DJGPP__ >= 2 */
   (stdin)->_flag &= ~_IOTEXT;
   (stdout)->_flag &= ~_IOTEXT;
   (stderr)->_flag &= ~_IOTEXT;
+#endif /* not __DJGPP__ >= 2 */
 #endif /* MSDOS */
 
 #ifdef SET_EMACS_PRIORITY
@@ -776,9 +787,17 @@
   /* Call early 'cause init_environment needs it.  */
   init_dosfns ();
   /* Set defaults for several environment variables.  */
-  if (initialized) init_environment (argc, argv, skip_args);
-  else init_gettimeofday ();
+  if (initialized)
+    init_environment (argc, argv, skip_args);
+  else
+    {
+#if __DGJPP__ >= 2
+      tzset ();
+#else
+      init_gettimeofday ();
 #endif
+    }
+#endif /* MSDOS */
 
 #ifdef WINDOWSNT
   /* Initialize environment from registry settings.  */