diff options
| author | Richard M. Stallman | 1998-04-29 21:46:43 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1998-04-29 21:46:43 +0000 |
| commit | aa91317aed9e0ddd0f9f9f1b2c676ade1f68720d (patch) | |
| tree | 888b70ba998dc65ec91dc8b55489fbf6d59ea21b /src | |
| parent | 9f0f00d759e6752448520344f85ff0440e4b2351 (diff) | |
| download | emacs-aa91317aed9e0ddd0f9f9f1b2c676ade1f68720d.tar.gz emacs-aa91317aed9e0ddd0f9f9f1b2c676ade1f68720d.zip | |
(Fset_process_inherit_coding_system_flag, Fstart_process):
Store inherit_coding_system_flag as a Lisp_Object.
(Fopen_network_stream): Likewise.
(Fprocess_inherit_coding_system_flag): Access it as Lisp_Object.
(read_process_output): Likewise.
Diffstat (limited to 'src')
| -rw-r--r-- | src/process.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/process.c b/src/process.c index 09ca47a1f96..158f9d3ffcb 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -868,7 +868,7 @@ for the process which will run.") | |||
| 868 | register Lisp_Object process, flag; | 868 | register Lisp_Object process, flag; |
| 869 | { | 869 | { |
| 870 | CHECK_PROCESS (process, 0); | 870 | CHECK_PROCESS (process, 0); |
| 871 | XPROCESS (process)->inherit_coding_system_flag = !NILP (flag); | 871 | XPROCESS (process)->inherit_coding_system_flag = flag; |
| 872 | return flag; | 872 | return flag; |
| 873 | } | 873 | } |
| 874 | 874 | ||
| @@ -883,7 +883,7 @@ the process output.") | |||
| 883 | register Lisp_Object process; | 883 | register Lisp_Object process; |
| 884 | { | 884 | { |
| 885 | CHECK_PROCESS (process, 0); | 885 | CHECK_PROCESS (process, 0); |
| 886 | return XPROCESS (process)->inherit_coding_system_flag ? Qt : Qnil; | 886 | return XPROCESS (process)->inherit_coding_system_flag; |
| 887 | } | 887 | } |
| 888 | 888 | ||
| 889 | DEFUN ("process-kill-without-query", Fprocess_kill_without_query, | 889 | DEFUN ("process-kill-without-query", Fprocess_kill_without_query, |
| @@ -1273,7 +1273,8 @@ Remaining arguments are strings to give program as arguments.") | |||
| 1273 | XPROCESS (proc)->encoding_carryover = make_number (0); | 1273 | XPROCESS (proc)->encoding_carryover = make_number (0); |
| 1274 | 1274 | ||
| 1275 | XPROCESS (proc)->inherit_coding_system_flag | 1275 | XPROCESS (proc)->inherit_coding_system_flag |
| 1276 | = (NILP (buffer) || !inherit_process_coding_system) ? 0 : 1; | 1276 | = (NILP (buffer) || !inherit_process_coding_system |
| 1277 | ? Qnil : Qt); | ||
| 1277 | 1278 | ||
| 1278 | create_process (proc, (char **) new_argv, current_dir); | 1279 | create_process (proc, (char **) new_argv, current_dir); |
| 1279 | 1280 | ||
| @@ -2065,8 +2066,9 @@ Fourth arg SERVICE is name of the service desired, or an integer\n\ | |||
| 2065 | XPROCESS (proc)->encoding_buf = make_uninit_string (0); | 2066 | XPROCESS (proc)->encoding_buf = make_uninit_string (0); |
| 2066 | XPROCESS (proc)->encoding_carryover = make_number (0); | 2067 | XPROCESS (proc)->encoding_carryover = make_number (0); |
| 2067 | 2068 | ||
| 2068 | XPROCESS (proc)->inherit_coding_system_flag = | 2069 | XPROCESS (proc)->inherit_coding_system_flag |
| 2069 | NILP (buffer) || !inherit_process_coding_system ? 0 : 1; | 2070 | = (NILP (buffer) || !inherit_process_coding_system |
| 2071 | ? Qnil : Qt); | ||
| 2070 | 2072 | ||
| 2071 | UNGCPRO; | 2073 | UNGCPRO; |
| 2072 | return proc; | 2074 | return proc; |
| @@ -2917,7 +2919,7 @@ read_process_output (proc, channel) | |||
| 2917 | 2919 | ||
| 2918 | /* If the caller required, let the process associated buffer | 2920 | /* If the caller required, let the process associated buffer |
| 2919 | inherit the coding-system used to decode the process output. */ | 2921 | inherit the coding-system used to decode the process output. */ |
| 2920 | if (p->inherit_coding_system_flag | 2922 | if (! NILP (p->inherit_coding_system_flag) |
| 2921 | && !NILP (p->buffer) && !NILP (XBUFFER (p->buffer)->name)) | 2923 | && !NILP (p->buffer) && !NILP (XBUFFER (p->buffer)->name)) |
| 2922 | { | 2924 | { |
| 2923 | struct buffer *prev_buf = current_buffer; | 2925 | struct buffer *prev_buf = current_buffer; |