mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-13 09:32:47 +00:00
Code Issues Releases Activity

Prefer expand-file-name to concat in native-compilation code

Browse Source 
* 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)
This commit is contained in:
Eli Zaretskii 2021-03-15 16:56:08 +02:00
parent 5e4ec4d3c9
commit aabda4263b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/emacs-lisp/comp.el
View File

@ -3691,9 +3691,9 @@ Prepare every function for final compilation and drive the C back-end."
"Return a list of effective eln load directories.
Account for `comp-load-path' and `comp-native-version-dir'."
(mapcar (lambda (dir)
(concat (file-name-as-directory
(expand-file-name dir invocation-directory))
comp-native-version-dir))
(expand-file-name comp-native-version-dir
(file-name-as-directory
(expand-file-name dir invocation-directory))))
comp-eln-load-path))
(defun comp-trampoline-filename (subr-name)

8
src/comp.c
View File

@ -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)