aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa1997-07-02 12:54:04 +0000
committerKenichi Handa1997-07-02 12:54:04 +0000
commit08ee4e8761bf2a384f729c0224c059599b151f81 (patch)
treedc7ea7f58b6ad979fca7460e7b4b34b6693caea3
parent789f17002ff1b6efdf04136e95a5b4caa2a1d334 (diff)
downloademacs-08ee4e8761bf2a384f729c0224c059599b151f81.tar.gz
emacs-08ee4e8761bf2a384f729c0224c059599b151f81.zip
Call Ffind_operation_coding_system.
-rw-r--r--src/callproc.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/callproc.c b/src/callproc.c
index 7cd94646dec..14a439bc444 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -238,7 +238,7 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.")
238 output. */ 238 output. */
239 { 239 {
240 Lisp_Object val, *args2; 240 Lisp_Object val, *args2;
241 /* Qt denotes that we have not yet called Ffind_coding_system. */ 241 /* Qt denotes we have not yet called Ffind_operation_coding_system. */
242 Lisp_Object coding_systems = Qt; 242 Lisp_Object coding_systems = Qt;
243 int i; 243 int i;
244 244
@@ -250,7 +250,7 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.")
250 args2 = (Lisp_Object *) alloca ((nargs + 1) * sizeof *args2); 250 args2 = (Lisp_Object *) alloca ((nargs + 1) * sizeof *args2);
251 args2[0] = Qcall_process; 251 args2[0] = Qcall_process;
252 for (i = 0; i < nargs; i++) args2[i + 1] = args[i]; 252 for (i = 0; i < nargs; i++) args2[i + 1] = args[i];
253 coding_systems = Ffind_coding_system (nargs + 1, args2); 253 coding_systems = Ffind_operation_coding_system (nargs + 1, args2);
254 if (CONSP (coding_systems)) 254 if (CONSP (coding_systems))
255 val = XCONS (coding_systems)->cdr; 255 val = XCONS (coding_systems)->cdr;
256 else if (CONSP (Vdefault_process_coding_system)) 256 else if (CONSP (Vdefault_process_coding_system))
@@ -273,7 +273,8 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.")
273 args2 = (Lisp_Object *) alloca ((nargs + 1) * sizeof *args2); 273 args2 = (Lisp_Object *) alloca ((nargs + 1) * sizeof *args2);
274 args2[0] = Qcall_process; 274 args2[0] = Qcall_process;
275 for (i = 0; i < nargs; i++) args2[i + 1] = args[i]; 275 for (i = 0; i < nargs; i++) args2[i + 1] = args[i];
276 coding_systems = Ffind_coding_system (nargs + 1, args2); 276 coding_systems
277 = Ffind_operation_coding_system (nargs + 1, args2);
277 } 278 }
278 if (CONSP (coding_systems)) 279 if (CONSP (coding_systems))
279 val = XCONS (coding_systems)->car; 280 val = XCONS (coding_systems)->car;
@@ -735,7 +736,7 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.")
735 Lisp_Object filename_string; 736 Lisp_Object filename_string;
736 register Lisp_Object start, end; 737 register Lisp_Object start, end;
737 int count = specpdl_ptr - specpdl; 738 int count = specpdl_ptr - specpdl;
738 /* Qt denotes that we have not yet called Ffind_coding_system. */ 739 /* Qt denotes we have not yet called Ffind_operation_coding_system. */
739 Lisp_Object coding_systems = Qt; 740 Lisp_Object coding_systems = Qt;
740 Lisp_Object val, *args2; 741 Lisp_Object val, *args2;
741 int i; 742 int i;
@@ -785,7 +786,7 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.")
785 args2 = (Lisp_Object *) alloca ((nargs + 1) * sizeof *args2); 786 args2 = (Lisp_Object *) alloca ((nargs + 1) * sizeof *args2);
786 args2[0] = Qcall_process_region; 787 args2[0] = Qcall_process_region;
787 for (i = 0; i < nargs; i++) args2[i + 1] = args[i]; 788 for (i = 0; i < nargs; i++) args2[i + 1] = args[i];
788 coding_systems = Ffind_coding_system (nargs + 1, args2); 789 coding_systems = Ffind_operation_coding_system (nargs + 1, args2);
789 if (CONSP (coding_systems)) 790 if (CONSP (coding_systems))
790 val = XCONS (coding_systems)->cdr; 791 val = XCONS (coding_systems)->cdr;
791 else if (CONSP (Vdefault_process_coding_system)) 792 else if (CONSP (Vdefault_process_coding_system))
@@ -806,7 +807,7 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.")
806 args2 = (Lisp_Object *) alloca ((nargs + 1) * sizeof *args2); 807 args2 = (Lisp_Object *) alloca ((nargs + 1) * sizeof *args2);
807 args2[0] = Qcall_process_region; 808 args2[0] = Qcall_process_region;
808 for (i = 0; i < nargs; i++) args2[i + 1] = args[i]; 809 for (i = 0; i < nargs; i++) args2[i + 1] = args[i];
809 coding_systems = Ffind_coding_system (nargs + 1, args2); 810 coding_systems = Ffind_operation_coding_system (nargs + 1, args2);
810 } 811 }
811 val = CONSP (coding_systems) ? XCONS (coding_systems)->car : Qnil; 812 val = CONSP (coding_systems) ? XCONS (coding_systems)->car : Qnil;
812 } 813 }