(Fkill_emacs): Use EXIT_SUCCESS;

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 15adf3bddb520c76518ea7cbe5fde13d71971fc1..ae9d64f13c02a4ee65c1e1290f3943f7332bf9f3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-03  Thien-Thi Nguyen  <ttn@surf.glug.org>
+
+       * emacs.c (Fkill_emacs): Use EXIT_SUCCESS;
+       no longer special-case VMS.  Add bogus return value.
+
 2004-05-06  Thien-Thi Nguyen  <ttn@gnu.org>
 
        * emacs.c (main) [VMS]: Fix var ref.

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