From: Eshel Yaron <me@eshelyaron.com>
Date: Sun, 9 Feb 2025 07:59:31 +0000 (+0100)
Subject: Fix merge
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4852dd8dd2bc6580725d04a73c59993119e7213d;p=emacs.git

Fix merge
---

diff --git a/src/comp.c b/src/comp.c
index 13fb651b930..692b28e00cb 100644
--- 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)))
     {