(Fkill_emacs): Use EXIT_SUCCESS;

no longer special-case VMS.  Add bogus return value.

diff --git a/src/ChangeLog b/src/ChangeLog
index e341ac6557743a3d1fbf393f6e849d1ad3d6ed3c..67215ee5176e2ee1d99929d97bd7ac1767abef83 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-03  Thien-Thi Nguyen  <ttn@gnu.org>
+
+       * emacs.c (Fkill_emacs): Use EXIT_SUCCESS;
+       no longer special-case VMS.  Add bogus return value.
+
 2005-03-02  Kim F. Storm  <storm@cua.dk>
 
        * dispextern.h (XASSERTS): Define to 0 if not already defined.

diff --git a/src/emacs.c b/src/emacs.c
index cdc80ae0893bc472cb2135941d155b4c0aecd19b..75196d83159b7d724451cb6cbd8944f89090462e 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2052,14 +2052,9 @@ all of which are called before Emacs is actually killed.  */)
   if (STRINGP (Vauto_save_list_file_name))
     unlink (SDATA (Vauto_save_list_file_name));
 
-  exit (INTEGERP (arg) ? XINT (arg)
-#ifdef VMS
-       : 1
-#else
-       : 0
-#endif
-       );
+  exit (INTEGERP (arg) ? XINT (arg) : EXIT_SUCCESS);
   /* NOTREACHED */
+  return 0;
 }