summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2021-03-15 16:56:08 +0200
committerEli Zaretskii <eliz@gnu.org>2021-03-15 16:56:08 +0200
commitaabda4263bc2000a69e61e93a232e71f8afedec9 (patch)
tree4649d448243c1da445e207b5f26fe786cd35e6f4 /lisp/emacs-lisp
parent5e4ec4d3c944f586892e08ea4fb7715e0f6ac365 (diff)
downloademacs-aabda4263bc2000a69e61e93a232e71f8afedec9.tar.gz
emacs-aabda4263bc2000a69e61e93a232e71f8afedec9.tar.bz2
emacs-aabda4263bc2000a69e61e93a232e71f8afedec9.zip
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)
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/comp.el6
1 files changed, 3 insertions, 3 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)