diff options
| author | Kenichi Handa <handa@m17n.org> | 2005-06-06 04:18:18 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2005-06-06 04:18:18 +0000 |
| commit | 45d60801ba145066995ebeaa9b29342b6ecfa85a (patch) | |
| tree | b5575a5e9a5e0445c26f4998af0dbed931857813 /src/callproc.c | |
| parent | 7b953c9cd0eca0fc08ff31dd604ea2d3e40415a5 (diff) | |
| download | emacs-45d60801ba145066995ebeaa9b29342b6ecfa85a.tar.gz emacs-45d60801ba145066995ebeaa9b29342b6ecfa85a.tar.bz2 emacs-45d60801ba145066995ebeaa9b29342b6ecfa85a.zip | |
(Fcall_process): Sync with the change in
HEAD (2005-06-04).
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/callproc.c b/src/callproc.c index 524f6a6a078..0c8089c9322 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -783,11 +783,11 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) insert_1_both (buf, nread, nread, 0, 1, 0); else { /* We have to decode the input. */ - Lisp_Object buf; + Lisp_Object curbuf; - XSETBUFFER (buf, current_buffer); - decode_coding_c_string (&process_coding, bufptr, nread, - buf); + XSETBUFFER (curbuf, current_buffer); + decode_coding_c_string (&process_coding, buf, nread, + curbuf); if (display_on_the_fly && CODING_REQUIRE_DETECTION (&saved_coding) && ! CODING_REQUIRE_DETECTION (&process_coding)) @@ -819,7 +819,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) if (carryover > 0) /* As CARRYOVER should not be that large, we had better avoid overhead of bcopy. */ - BCOPY_SHORT (process_coding.carryover, bufptr, + BCOPY_SHORT (process_coding.carryover, buf, process_coding.carryover_bytes); } } |