Commit 1090a161 authored by Richard M. Stallman's avatar Richard M. Stallman

Delete all APOLLO conditionals.

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

(Fkill_emacs): Delete the Vauto_save_list_file_name file.
parent 14510fee
...@@ -35,12 +35,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ ...@@ -35,12 +35,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <sys/ioctl.h> #include <sys/ioctl.h>
#endif #endif
#ifdef APOLLO
#ifndef APOLLO_SR10
#include <default_acl.h>
#endif
#endif
#include "lisp.h" #include "lisp.h"
#include "commands.h" #include "commands.h"
#include "intervals.h" #include "intervals.h"
...@@ -120,6 +114,8 @@ char *stack_bottom; ...@@ -120,6 +114,8 @@ char *stack_bottom;
extern Lisp_Object Vwindow_system; extern Lisp_Object Vwindow_system;
#endif /* HAVE_X_WINDOWS */ #endif /* HAVE_X_WINDOWS */
extern Lisp_Object Vauto_save_list_file_name;
#ifdef USG_SHARED_LIBRARIES #ifdef USG_SHARED_LIBRARIES
/* If nonzero, this is the place to put the end of the writable segment /* If nonzero, this is the place to put the end of the writable segment
at startup. */ at startup. */
...@@ -499,15 +495,6 @@ main (argc, argv, envp) ...@@ -499,15 +495,6 @@ main (argc, argv, envp)
clearerr (stdin); 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 #ifndef SYSTEM_MALLOC
if (! initialized) if (! initialized)
{ {
...@@ -1142,6 +1129,11 @@ all of which are called before Emacs is actually killed.") ...@@ -1142,6 +1129,11 @@ all of which are called before Emacs is actually killed.")
if (!NILP (Vrun_hooks) && !noninteractive) if (!NILP (Vrun_hooks) && !noninteractive)
call1 (Vrun_hooks, intern ("kill-emacs-hook")); 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; UNGCPRO;
/* Is it really necessary to do this deassign /* Is it really necessary to do this deassign
...@@ -1237,8 +1229,6 @@ shut_down_emacs (sig, no_x, stuff) ...@@ -1237,8 +1229,6 @@ shut_down_emacs (sig, no_x, stuff)
#ifndef CANNOT_DUMP #ifndef CANNOT_DUMP
/* Nothing like this can be implemented on an Apollo.
What a loss! */
#ifdef HAVE_SHM #ifdef HAVE_SHM
...@@ -1261,7 +1251,7 @@ This function exists on systems that use HAVE_SHM.") ...@@ -1261,7 +1251,7 @@ This function exists on systems that use HAVE_SHM.")
/* Tell malloc where start of impure now is */ /* Tell malloc where start of impure now is */
/* Also arrange for warnings when nearly out of space. */ /* Also arrange for warnings when nearly out of space. */
#ifndef SYSTEM_MALLOC #ifndef SYSTEM_MALLOC
memory_warnings (&my_edata, malloc_warning); memory_warnings (my_edata, malloc_warning);
#endif #endif
map_out_data (XSTRING (intoname)->data); map_out_data (XSTRING (intoname)->data);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment