From aabda4263bc2000a69e61e93a232e71f8afedec9 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii
Date: Mon, 15 Mar 2021 16:56:08 +0200
Subject: Prefer expand-file-name to concat in native-compilation code

* lisp/emacs-lisp/comp.el (comp-eln-load-path-eff):
* src/comp.c (Fcomp_el_to_eln_filename)
(eln_load_path_final_clean_up): Prefer expand-file-name to concat.
(Bug#43725)
---
 src/comp.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/comp.c b/src/comp.c
index a79ee4ad87b..29b16c78ac0 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -4121,8 +4121,8 @@ If BASE-DIR is nil use the first entry in `comp-eln-load-path'.  */)
     base_dir = Fexpand_file_name (base_dir, Vinvocation_directory);
 
   return Fexpand_file_name (filename,
-			    concat2 (Ffile_name_as_directory (base_dir),
-				     Vcomp_native_version_dir));
+			    Fexpand_file_name (Vcomp_native_version_dir,
+					       base_dir));
 }
 
 DEFUN ("comp--install-trampoline", Fcomp__install_trampoline,
@@ -4613,8 +4613,8 @@ eln_load_path_final_clean_up (void)
     {
       Lisp_Object files_in_dir =
 	internal_condition_case_5 (Fdirectory_files,
-				   concat2 (XCAR (dir_tail),
-					    Vcomp_native_version_dir),
+				   Fexpand_file_name (Vcomp_native_version_dir,
+						      XCAR (dir_tail)),
 				   Qt, build_string ("\\.eln\\.old\\'"), Qnil,
 				   Qnil, Qt, return_nil);
       FOR_EACH_TAIL (files_in_dir)
-- 
cgit v1.2.1