Commit 9fefd2ba authored by Jim Blandy's avatar Jim Blandy

* callproc.c (delete_temp_file): Declare this to return

	Lisp_Object, to smooth type-checking.

	* callproc.c (init_callproc): Move the initialization of
	Vprocess_environment to its own function.
	(set_process_environment): This is that.
	* emacs.c (main): Call set_process_environment earlier than
	init_callproc.
parent f054132a
......@@ -334,7 +334,7 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.")
}
#endif
static void
static Lisp_Object
delete_temp_file (name)
Lisp_Object name;
{
......@@ -572,7 +572,6 @@ egetenv (var)
init_callproc ()
{
register char * sh;
register char **envp;
Lisp_Object tempdir;
{
......@@ -611,6 +610,11 @@ init_callproc ()
sh = (char *) getenv ("SHELL");
Vshell_file_name = build_string (sh ? sh : "/bin/sh");
#endif
}
set_process_environment ()
{
register char **envp;
Vprocess_environment = Qnil;
#ifndef CANNOT_DUMP
......
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