Delete all APOLLO conditionals.

(Fdump_emacs_data): Don't use & before my_edata.

(Fkill_emacs): Delete the Vauto_save_list_file_name file.

diff --git a/src/emacs.c b/src/emacs.c
index 686a784e10cc044453c7877ef182d72c7a91978d..396c80210acc4e2d25337a3245a254fef87669ea 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -35,12 +35,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sys/ioctl.h>
 #endif
 
-#ifdef APOLLO
-#ifndef APOLLO_SR10
-#include <default_acl.h>
-#endif
-#endif
-
 #include "lisp.h"
 #include "commands.h"
 #include "intervals.h"
@@ -120,6 +114,8 @@ char *stack_bottom;
 extern Lisp_Object Vwindow_system;
 #endif /* HAVE_X_WINDOWS */
 
+extern Lisp_Object Vauto_save_list_file_name;
+
 #ifdef USG_SHARED_LIBRARIES
 /* If nonzero, this is the place to put the end of the writable segment
    at startup.  */
@@ -499,15 +495,6 @@ main (argc, argv, envp)
 
   clearerr (stdin);
 
-#ifdef APOLLO
-#ifndef APOLLO_SR10
-  /* If USE_DOMAIN_ACLS environment variable exists,
-     use ACLs rather than UNIX modes. */
-  if (egetenv ("USE_DOMAIN_ACLS"))
-    default_acl (USE_DEFACL);
-#endif
-#endif /* APOLLO */
-
 #ifndef SYSTEM_MALLOC
   if (! initialized)
     {
@@ -1142,6 +1129,11 @@ all of which are called before Emacs is actually killed.")
   if (!NILP (Vrun_hooks) && !noninteractive)
     call1 (Vrun_hooks, intern ("kill-emacs-hook"));
 
+  /* If we have an auto-save list file,
+     kill it because we are exiting Emacs deliberately (not crashing).  */
+  if (STRINGP (Vauto_save_list_file_name))
+    unlink (XSTRING (Vauto_save_list_file_name)->data);
+
   UNGCPRO;
 
 /* Is it really necessary to do this deassign
@@ -1237,8 +1229,6 @@ shut_down_emacs (sig, no_x, stuff)
 
 \f
 #ifndef CANNOT_DUMP
-/* Nothing like this can be implemented on an Apollo.
-   What a loss!  */
 
 #ifdef HAVE_SHM
 
@@ -1261,7 +1251,7 @@ This function exists on systems that use HAVE_SHM.")
   /* Tell malloc where start of impure now is */
   /* Also arrange for warnings when nearly out of space.  */
 #ifndef SYSTEM_MALLOC
-  memory_warnings (&my_edata, malloc_warning);
+  memory_warnings (my_edata, malloc_warning);
 #endif
   map_out_data (XSTRING (intoname)->data);