diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2021-03-15 16:56:08 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2021-03-15 16:56:08 +0200 |
| commit | aabda4263bc2000a69e61e93a232e71f8afedec9 (patch) | |
| tree | 4649d448243c1da445e207b5f26fe786cd35e6f4 | |
| parent | 5e4ec4d3c944f586892e08ea4fb7715e0f6ac365 (diff) | |
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)
| -rw-r--r-- | lisp/emacs-lisp/comp.el | 6 | ||||
| -rw-r--r-- | src/comp.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index 97efd1ab0c7..5a4a2f6ef15 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el @@ -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) 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) |