comparison src/callproc.c @ 1912:f0d4fb2b9157

* 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.
author Jim Blandy <jimb@redhat.com>
date Mon, 22 Feb 1993 14:24:42 +0000
parents dd2e31cbf205
children 7f66b40a0192
comparison
equal deleted inserted replaced
1911:d9fc49956cd8 1912:f0d4fb2b9157
332 return build_string (synch_process_death); 332 return build_string (synch_process_death);
333 return make_number (synch_process_retcode); 333 return make_number (synch_process_retcode);
334 } 334 }
335 #endif 335 #endif
336 336
337 static void 337 static Lisp_Object
338 delete_temp_file (name) 338 delete_temp_file (name)
339 Lisp_Object name; 339 Lisp_Object name;
340 { 340 {
341 unlink (XSTRING (name)->data); 341 unlink (XSTRING (name)->data);
342 } 342 }
570 #endif /* not VMS */ 570 #endif /* not VMS */
571 571
572 init_callproc () 572 init_callproc ()
573 { 573 {
574 register char * sh; 574 register char * sh;
575 register char **envp;
576 Lisp_Object tempdir; 575 Lisp_Object tempdir;
577 576
578 { 577 {
579 char *data_dir = egetenv ("EMACSDATA"); 578 char *data_dir = egetenv ("EMACSDATA");
580 579
609 Vshell_file_name = build_string ("*dcl*"); 608 Vshell_file_name = build_string ("*dcl*");
610 #else 609 #else
611 sh = (char *) getenv ("SHELL"); 610 sh = (char *) getenv ("SHELL");
612 Vshell_file_name = build_string (sh ? sh : "/bin/sh"); 611 Vshell_file_name = build_string (sh ? sh : "/bin/sh");
613 #endif 612 #endif
613 }
614
615 set_process_environment ()
616 {
617 register char **envp;
614 618
615 Vprocess_environment = Qnil; 619 Vprocess_environment = Qnil;
616 #ifndef CANNOT_DUMP 620 #ifndef CANNOT_DUMP
617 if (initialized) 621 if (initialized)
618 #endif 622 #endif