Merged in changes from CVS HEAD

Patches applied:

 * miles@gnu.org--gnu-2003/emacs--cvs-trunk--0--patch-138
   Update from CVS

 * miles@gnu.org--gnu-2003/emacs--cvs-trunk--0--patch-139
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-15

2 files changed, 7 insertions, 4 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 3e2350c7842..1a0774e7e57 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-24  Thien-Thi Nguyen  <ttn@gnu.org>
+
+        * make-docfile.c (main): For return code, no longer special-case VMS.
+        Instead, use `EXIT_SUCCESS' and `EXIT_FAILURE' from stdlib.h.
+
 2003-09-28  Andreas B,A|(Bsching  <crunchy@tzi.de>  (tiny change)
 
         * emacsclient.c (quote_file_name): Print the result instead of
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 7330b821768..4210320b591 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -23,6 +23,7 @@ Boston, MA 02111-1307, USA.  */
  of GNU Emacs.  .elc and .el and .c files are allowed.
  A .o file can also be specified; the .c file it was made from is used.
  This helps the makefile pass the correct list of files.
+ Option -d DIR means change to DIR before looking for files.
 
  The results, which go to standard output or to a file
  specified with -a or -o (-a to append, -o to start from nothing),
@@ -174,10 +175,7 @@ main (argc, argv)
       if (j == i)
         err_count += scan_file (argv[i]);
     }
-#ifndef VMS
-  exit (err_count > 0);
-#endif /* VMS */
-  return err_count > 0;
+  return (err_count > 0 ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 
 /* Read file FILENAME and output its doc strings to outfile.  */