summaryrefslogtreecommitdiff
path: root/src/callproc.c
diff options
context:
space:
mode:
authorJim Blandy <jimb@redhat.com>1993-02-22 14:24:42 +0000
committerJim Blandy <jimb@redhat.com>1993-02-22 14:24:42 +0000
commit04eb3c4c0d67104414ee7fda128aae3017f040e1 (patch)
tree04309728c161294e33cac22ef15cbfcad430ca1a /src/callproc.c
parentef31762aef2c1e80bdd38e54cf098e77c0256d3b (diff)
downloademacs-04eb3c4c0d67104414ee7fda128aae3017f040e1.tar.gz
* 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.
Diffstat (limited to 'src/callproc.c')
-rw-r--r--src/callproc.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/callproc.c b/src/callproc.c
index 6278b46022c..383a1d74774 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -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