# HG changeset patch
# User Jim Blandy <jimb@redhat.com>
# Date 730391082 0
# Node ID f0d4fb2b9157bb9cab05d6a2f0a1b5722acb1028
# Parent  d9fc49956cd8ac34c57fa690d0ac359b1f36f722
	* 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.

diff -r d9fc49956cd8 -r f0d4fb2b9157 src/callproc.c
--- a/src/callproc.c	Mon Feb 22 14:23:26 1993 +0000
+++ b/src/callproc.c	Mon Feb 22 14:24:42 1993 +0000
@@ -334,7 +334,7 @@
 }
 #endif
 
-static void
+static Lisp_Object
 delete_temp_file (name)
      Lisp_Object name;
 {
@@ -572,7 +572,6 @@
 init_callproc ()
 {
   register char * sh;
-  register char **envp;
   Lisp_Object tempdir;
 
   {
@@ -611,6 +610,11 @@
   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