# HG changeset patch # User Kenichi Handa # Date 1118031498 0 # Node ID d8a6a0474c49d76b296c15201b77e9cefb0f14d4 # Parent 6141b4c28957357fc03ab2ef6f02d680527de2e0 (Fcall_process): Sync with the change in HEAD (2005-06-04). diff -r 6141b4c28957 -r d8a6a0474c49 src/callproc.c --- a/src/callproc.c Mon Jun 06 03:26:08 2005 +0000 +++ b/src/callproc.c Mon Jun 06 04:18:18 2005 +0000 @@ -783,11 +783,11 @@ 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 @@ 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); } }