Fix merge

diff --git a/src/comp.c b/src/comp.c
index 13fb651b9306074debbd5a12630dc5f439277a93..692b28e00cb8a33e28f07ae2bbe96d7f6a3af11a 100644 (file)
--- a/src/comp.c
+++ b/src/comp.c
@@ -4825,7 +4825,7 @@ DEFUN ("comp--compile-ctxt-to-file0", Fcomp__compile_ctxt_to_file0,
 #endif
 
   comp.d_default_idx =
-    CALL1I (comp-data-container-idx, CALL1I (comp-ctxt-d-default, Vcomp_ctxt));
+    CALLNI (comp-data-container-idx, CALLNI (comp-ctxt-d-default, Vcomp_ctxt));
   comp.d_ephemeral_idx =
     CALLNI (comp-data-container-idx, CALLNI (comp-ctxt-d-ephemeral, Vcomp_ctxt));
 
@@ -5083,7 +5083,7 @@ maybe_defer_native_compilation (Lisp_Object function_name,
     return;
 
   Lisp_Object src =
-    concat2 (CALL1I (file-name-sans-extension, Vload_true_file_name),
+    concat2 (CALLNI (file-name-sans-extension, Vload_true_file_name),
             build_string (".el"));
   if (NILP (Ffile_exists_p (src)))
     {