\f
#ifdef VMS
#ifdef LINK_CRTL_SHARE
-#ifdef SHAREABLE_LIB_BUG
+#ifdef SHARABLE_LIB_BUG
extern noshare char **environ;
-#endif /* SHAREABLE_LIB_BUG */
+#endif /* SHARABLE_LIB_BUG */
#endif /* LINK_CRTL_SHARE */
#endif /* VMS */
extern int errno;
extern sys_nerr;
+#ifdef LINUX_SBRK_BUG
+ __sbrk (1);
+#endif
+
sort_args (argc, argv);
if (argmatch (argv, argc, "-version", "--version", 3, NULL, &skip_args))
}
#ifdef LINK_CRTL_SHARE
-#ifdef SHAREABLE_LIB_BUG
+#ifdef SHARABLE_LIB_BUG
/* Bletcherous shared libraries! */
if (!stdin)
stdin = fdopen (0, "r");
stderr = fdopen (2, "w");
if (!environ)
environ = envp;
-#endif /* SHAREABLE_LIB_BUG */
+#endif /* SHARABLE_LIB_BUG */
#endif /* LINK_CRTL_SHARE */
#endif /* VMS */
/* Change --display to -d, when its arg is separate. */
else if (displayname != 0 && skip_args > count_before
&& argv[count_before + 1][1] == '-')
- argv[count_before] = "-d";
+ argv[count_before + 1] = "-d";
/* Don't actually discard this arg. */
skip_args = count_before;
#ifdef HAVE_X11
syms_of_xselect ();
#endif
-#ifdef HAVE_X_MENU
- syms_of_xmenu ();
-#endif /* HAVE_X_MENU */
#endif /* HAVE_X_WINDOWS */
#if defined (MSDOS) && !defined (HAVE_X_WINDOWS)
syms_of_xfaces ();
- syms_of_xmenu ();
#endif
+#ifdef HAVE_MENUS
+ syms_of_xmenu ();
+#endif /* HAVE_MENUS */
+
#ifdef HAVE_NTGUI
syms_of_win32term ();
syms_of_win32fns ();
DEFUN ("dump-emacs-data", Fdump_emacs_data, Sdump_emacs_data, 1, 1, 0,
"Dump current state of Emacs into data file FILENAME.\n\
This function exists on systems that use HAVE_SHM.")
- (intoname)
- Lisp_Object intoname;
+ (filename)
+ Lisp_Object filename;
{
extern char my_edata[];
Lisp_Object tem;
- CHECK_STRING (intoname, 0);
- intoname = Fexpand_file_name (intoname, Qnil);
+ CHECK_STRING (filename, 0);
+ filename = Fexpand_file_name (filename, Qnil);
tem = Vpurify_flag;
Vpurify_flag = Qnil;
#ifndef SYSTEM_MALLOC
memory_warnings (my_edata, malloc_warning);
#endif
- map_out_data (XSTRING (intoname)->data);
+ map_out_data (XSTRING (filename)->data);
Vpurify_flag = tem;
Bind `command-line-processed' to nil before dumping,\n\
if you want the dumped Emacs to process its command line\n\
and announce itself normally when it is run.")
- (intoname, symname)
- Lisp_Object intoname, symname;
+ (filename, symfile)
+ Lisp_Object filename, symfile;
{
extern char my_edata[];
Lisp_Object tem;
- CHECK_STRING (intoname, 0);
- intoname = Fexpand_file_name (intoname, Qnil);
- if (!NILP (symname))
+ CHECK_STRING (filename, 0);
+ filename = Fexpand_file_name (filename, Qnil);
+ if (!NILP (symfile))
{
- CHECK_STRING (symname, 0);
- if (XSTRING (symname)->size)
- symname = Fexpand_file_name (symname, Qnil);
+ CHECK_STRING (symfile, 0);
+ if (XSTRING (symfile)->size)
+ symfile = Fexpand_file_name (symfile, Qnil);
}
tem = Vpurify_flag;
fflush (stdout);
#ifdef VMS
- mapout_data (XSTRING (intoname)->data);
+ mapout_data (XSTRING (filename)->data);
#else
/* Tell malloc where start of impure now is */
/* Also arrange for warnings when nearly out of space. */
memory_warnings (my_edata, malloc_warning);
#endif /* not WINDOWSNT */
#endif
- unexec (XSTRING (intoname)->data,
- !NILP (symname) ? XSTRING (symname)->data : 0, my_edata, 0, 0);
+ unexec (XSTRING (filename)->data,
+ !NILP (symfile) ? XSTRING (symfile)->data : 0, my_edata, 0, 0);
#endif /* not VMS */
Vpurify_flag = tem;