aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2005-06-06 04:18:18 +0000
committerKenichi Handa2005-06-06 04:18:18 +0000
commit45d60801ba145066995ebeaa9b29342b6ecfa85a (patch)
treeb5575a5e9a5e0445c26f4998af0dbed931857813 /src
parent7b953c9cd0eca0fc08ff31dd604ea2d3e40415a5 (diff)
downloademacs-45d60801ba145066995ebeaa9b29342b6ecfa85a.tar.gz
emacs-45d60801ba145066995ebeaa9b29342b6ecfa85a.zip
(Fcall_process): Sync with the change in
HEAD (2005-06-04).
Diffstat (limited to 'src')
-rw-r--r--src/callproc.c10
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) */)
783 insert_1_both (buf, nread, nread, 0, 1, 0); 783 insert_1_both (buf, nread, nread, 0, 1, 0);
784 else 784 else
785 { /* We have to decode the input. */ 785 { /* We have to decode the input. */
786 Lisp_Object buf; 786 Lisp_Object curbuf;
787 787
788 XSETBUFFER (buf, current_buffer); 788 XSETBUFFER (curbuf, current_buffer);
789 decode_coding_c_string (&process_coding, bufptr, nread, 789 decode_coding_c_string (&process_coding, buf, nread,
790 buf); 790 curbuf);
791 if (display_on_the_fly 791 if (display_on_the_fly
792 && CODING_REQUIRE_DETECTION (&saved_coding) 792 && CODING_REQUIRE_DETECTION (&saved_coding)
793 && ! CODING_REQUIRE_DETECTION (&process_coding)) 793 && ! CODING_REQUIRE_DETECTION (&process_coding))
@@ -819,7 +819,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */)
819 if (carryover > 0) 819 if (carryover > 0)
820 /* As CARRYOVER should not be that large, we had 820 /* As CARRYOVER should not be that large, we had
821 better avoid overhead of bcopy. */ 821 better avoid overhead of bcopy. */
822 BCOPY_SHORT (process_coding.carryover, bufptr, 822 BCOPY_SHORT (process_coding.carryover, buf,
823 process_coding.carryover_bytes); 823 process_coding.carryover_bytes);
824 } 824 }
825 } 825 }