aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorMiles Bader2006-05-10 20:42:41 +0000
committerMiles Bader2006-05-10 20:42:41 +0000
commit3bcf2b084a0dd1ff0399480d57b87e01cfe061dc (patch)
tree355c68cda5a5c9c73824840df3cdae6320017283 /src/process.c
parent0ea38cf9dca8f2b148d78f638eed17e8896984af (diff)
parentd105bfecce2288cd99f591382586a22a4ce1b6f2 (diff)
downloademacs-3bcf2b084a0dd1ff0399480d57b87e01cfe061dc.tar.gz
emacs-3bcf2b084a0dd1ff0399480d57b87e01cfe061dc.zip
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-60
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 259-273) - Update from CVS - lisp/replace.el (occur-engine): Bind `inhibit-field-text-motion' to t - Merge from gnus--rel--5.10 - Rename "field-at-point" to "field-at-pos" - (comint-insert-input): Remove redundant calls to setq and goto-char * gnus--rel--5.10 (patch 99-100) - Merge from emacs--devo--0 - Update from CVS
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/process.c b/src/process.c
index 8e4a0d22160..4e2717577cd 100644
--- a/src/process.c
+++ b/src/process.c
@@ -696,6 +696,8 @@ setup_process_coding_systems (process)
696 = (struct coding_system *) xmalloc (sizeof (struct coding_system)); 696 = (struct coding_system *) xmalloc (sizeof (struct coding_system));
697 setup_coding_system (p->encode_coding_system, 697 setup_coding_system (p->encode_coding_system,
698 proc_encode_coding_system[outch]); 698 proc_encode_coding_system[outch]);
699 if (proc_encode_coding_system[outch]->eol_type == CODING_EOL_UNDECIDED)
700 proc_encode_coding_system[outch]->eol_type = system_eol_type;
699} 701}
700 702
701DEFUN ("processp", Fprocessp, Sprocessp, 1, 1, 0, 703DEFUN ("processp", Fprocessp, Sprocessp, 1, 1, 0,
@@ -5067,6 +5069,10 @@ read_process_output (proc, channel)
5067 p->encode_coding_system = Vlast_coding_system_used; 5069 p->encode_coding_system = Vlast_coding_system_used;
5068 setup_coding_system (p->encode_coding_system, 5070 setup_coding_system (p->encode_coding_system,
5069 proc_encode_coding_system[XINT (p->outfd)]); 5071 proc_encode_coding_system[XINT (p->outfd)]);
5072 if (proc_encode_coding_system[XINT (p->outfd)]->eol_type
5073 == CODING_EOL_UNDECIDED)
5074 proc_encode_coding_system[XINT (p->outfd)]->eol_type
5075 = system_eol_type;
5070 } 5076 }
5071 } 5077 }
5072 5078
@@ -5176,6 +5182,10 @@ read_process_output (proc, channel)
5176 p->encode_coding_system = Vlast_coding_system_used; 5182 p->encode_coding_system = Vlast_coding_system_used;
5177 setup_coding_system (p->encode_coding_system, 5183 setup_coding_system (p->encode_coding_system,
5178 proc_encode_coding_system[XINT (p->outfd)]); 5184 proc_encode_coding_system[XINT (p->outfd)]);
5185 if (proc_encode_coding_system[XINT (p->outfd)]->eol_type
5186 == CODING_EOL_UNDECIDED)
5187 proc_encode_coding_system[XINT (p->outfd)]->eol_type
5188 = system_eol_type;
5179 } 5189 }
5180 } 5190 }
5181 if (coding->carryover_bytes > 0) 5191 if (coding->carryover_bytes > 0)