From: Andrea Corallo <akrl@sdf.org>
Date: Sun, 27 Dec 2020 16:50:05 +0000 (+0100)
Subject: * Don't require trailing backslashes in `comp-eln-load-path' (bug#45462)
X-Git-Tag: emacs-28.0.90~2727^2~211
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ee53560c8cb1236bb60304157882abe8e7cddaff;p=emacs.git

* Don't require trailing backslashes in `comp-eln-load-path' (bug#45462)

	* src/comp.c (Fcomp_el_to_eln_filename): Don't require
	trailing backslashes in comp-eln-load-path.
---

diff --git a/src/comp.c b/src/comp.c
index ee3c15a2f67..52ebf92c500 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -4085,7 +4085,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 (base_dir, Vcomp_native_version_dir));
+			    concat2 (Ffile_name_as_directory (base_dir),
+				     Vcomp_native_version_dir));
 }
 
 DEFUN ("comp--install-trampoline", Fcomp__install_trampoline,