Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 285-296)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: admin/FOR-RELEASE: Update refcard section.

 * gnus--rel--5.10  (patch 102-104)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64

1 files changed, 14 insertions, 0 deletions

diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c
index 0a06aa2c984..a8b2d441f9a 100644
--- a/lib-src/sorted-doc.c
+++ b/lib-src/sorted-doc.c
@@ -29,9 +29,15 @@
 
 #include <stdio.h>
 #include <ctype.h>
+#ifdef DOS_NT
+#include <fcntl.h>              /* for O_BINARY */
+#include <io.h>                 /* for setmode */
+#endif
 #ifndef HAVE_STDLIB_H           /* config.h includes stdlib.  */
+#ifndef WINDOWSNT               /* src/s/ms-w32.h includes stdlib.h */
 extern char *malloc ();
 #endif
+#endif
 
 #define NUL     '\0'
 #define MARKER '\037'
@@ -134,6 +140,14 @@ main ()
   DOCSTR *docs = NULL;          /* chain of allocated DOCSTRS */
   char buf[512];                /* line buffer */
 
+#ifdef DOS_NT
+  /* DOC is a binary file.  */
+  if (!isatty (fileno (stdin)))
+    setmode (fileno (stdin), O_BINARY);
+#endif
+
+  bp = buf;
+
   while (1)                     /* process one char at a time */
     {
       /* this char from the DOCSTR file */