aboutsummaryrefslogtreecommitdiffstats
path: root/src/coding.c
diff options
context:
space:
mode:
authorDmitry Antipov2012-07-30 10:43:46 +0400
committerDmitry Antipov2012-07-30 10:43:46 +0400
commit6cd7a13902729007a4d1e14a299bad47c9808353 (patch)
tree4c292449725756a65bca595d97a33740c3851094 /src/coding.c
parent227f5bd0b41ebec90ec61a2b8832c95cec20c5a9 (diff)
downloademacs-6cd7a13902729007a4d1e14a299bad47c9808353.tar.gz
emacs-6cd7a13902729007a4d1e14a299bad47c9808353.zip
Convert safe_call to use variable number of arguments.
* xdisp.c (safe_call): Convert to use varargs. Adjust users. (safe_call2): Fix comment. * lisp.h (safe_call): Adjust prototype. * coding.c (encode_coding_object): Change to use safe_call2. * xfaces.c (merge_face_heights): Change to use safe_call1.
Diffstat (limited to 'src/coding.c')
-rw-r--r--src/coding.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/coding.c b/src/coding.c
index 7b178b0ce14..e4ed65079d9 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -7931,15 +7931,12 @@ encode_coding_object (struct coding_system *coding,
7931 } 7931 }
7932 7932
7933 { 7933 {
7934 Lisp_Object args[3];
7935 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5; 7934 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
7936 7935
7937 GCPRO5 (coding->src_object, coding->dst_object, src_object, dst_object, 7936 GCPRO5 (coding->src_object, coding->dst_object, src_object, dst_object,
7938 old_deactivate_mark); 7937 old_deactivate_mark);
7939 args[0] = CODING_ATTR_PRE_WRITE (attrs); 7938 safe_call2 (CODING_ATTR_PRE_WRITE (attrs),
7940 args[1] = make_number (BEG); 7939 make_number (BEG), make_number (Z));
7941 args[2] = make_number (Z);
7942 safe_call (3, args);
7943 UNGCPRO; 7940 UNGCPRO;
7944 } 7941 }
7945 if (XBUFFER (coding->src_object) != current_buffer) 7942 if (XBUFFER (coding->src_object) != current_buffer)