(Fkill_emacs): Use EXIT_SUCCESS;

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 411622c3504d1347df1d360cea0f797f5fb6c954..6c66d498f3ab8d900aa53b8537f024d4475a71d9 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.
+
 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 e1816b59dc8994a364db350135930a1ea873a62f..1c30ac8501d671bcdd6dce9c037e66eb8a99a285 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;
 }