Mercurial > hg > xemacs-beta
comparison src/callproc.c @ 259:11cf20601dec r20-5b28
Import from CVS: tag r20-5b28
author | cvs |
---|---|
date | Mon, 13 Aug 2007 10:23:02 +0200 |
parents | 677f6a0ee643 |
children | 727739f917cb |
comparison
equal
deleted
inserted
replaced
258:58424f6abf56 | 259:11cf20601dec |
---|---|
30 #include "lstream.h" | 30 #include "lstream.h" |
31 #include <paths.h> | 31 #include <paths.h> |
32 #include "process.h" | 32 #include "process.h" |
33 #include "sysdep.h" | 33 #include "sysdep.h" |
34 #include "window.h" | 34 #include "window.h" |
35 #ifdef MULE | 35 #ifdef FILE_CODING |
36 #include "mule-coding.h" | 36 #include "file-coding.h" |
37 #endif | 37 #endif |
38 | 38 |
39 #include "systime.h" | 39 #include "systime.h" |
40 #include "sysproc.h" | 40 #include "sysproc.h" |
41 #include "sysfile.h" /* Always include after sysproc.h */ | 41 #include "sysfile.h" /* Always include after sysproc.h */ |
548 /* FSFmacs calls Fset_buffer() here. We don't have to because | 548 /* FSFmacs calls Fset_buffer() here. We don't have to because |
549 we can insert into buffers other than the current one. */ | 549 we can insert into buffers other than the current one. */ |
550 if (EQ (buffer, Qt)) | 550 if (EQ (buffer, Qt)) |
551 XSETBUFFER (buffer, current_buffer); | 551 XSETBUFFER (buffer, current_buffer); |
552 instream = make_filedesc_input_stream (fd[0], 0, -1, LSTR_ALLOW_QUIT); | 552 instream = make_filedesc_input_stream (fd[0], 0, -1, LSTR_ALLOW_QUIT); |
553 #ifdef MULE | 553 #ifdef FILE_CODING |
554 instream = | 554 instream = |
555 make_decoding_input_stream | 555 make_decoding_input_stream |
556 (XLSTREAM (instream), | 556 (XLSTREAM (instream), |
557 Fget_coding_system (Vcoding_system_for_read)); | 557 Fget_coding_system (Vcoding_system_for_read)); |
558 Lstream_set_character_mode (XLSTREAM (instream)); | 558 Lstream_set_character_mode (XLSTREAM (instream)); |
559 #endif /* MULE */ | 559 #endif |
560 NGCPRO1 (instream); | 560 NGCPRO1 (instream); |
561 while (1) | 561 while (1) |
562 { | 562 { |
563 QUIT; | 563 QUIT; |
564 /* Repeatedly read until we've filled as much as possible | 564 /* Repeatedly read until we've filled as much as possible |
972 /* jwz: always initialize Vprocess_environment, so that egetenv() works | 972 /* jwz: always initialize Vprocess_environment, so that egetenv() works |
973 in temacs. */ | 973 in temacs. */ |
974 { | 974 { |
975 char **envp; | 975 char **envp; |
976 for (envp = environ; envp && *envp; envp++) | 976 for (envp = environ; envp && *envp; envp++) |
977 Vprocess_environment = Fcons (build_ext_string (*envp, FORMAT_OS), | 977 { |
978 Vprocess_environment); | 978 Vprocess_environment = Fcons (build_ext_string (*envp, FORMAT_OS), |
979 Vprocess_environment); | |
980 } | |
979 } | 981 } |
980 | 982 |
981 /* jwz: don't do these things when in temacs (this used to be the case by | 983 /* jwz: don't do these things when in temacs (this used to be the case by |
982 virtue of egetenv() always returning 0, but that has been changed). | 984 virtue of egetenv() always returning 0, but that has been changed). |
983 */ | 985 */ |