[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
feature/native-comp 6568198: * src/pdumper.c (dump_do_dump_relocation):
From: |
Andrea Corallo |
Subject: |
feature/native-comp 6568198: * src/pdumper.c (dump_do_dump_relocation): Use `expand-file-name'. |
Date: |
Tue, 6 Apr 2021 15:20:48 -0400 (EDT) |
branch: feature/native-comp
commit 65681982134d973ee6bc78b627866e2ca4e242e7
Author: Andrea Corallo <akrl@sdf.org>
Commit: Andrea Corallo <akrl@sdf.org>
* src/pdumper.c (dump_do_dump_relocation): Use `expand-file-name'.
---
src/pdumper.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/pdumper.c b/src/pdumper.c
index e266b35..9b750a3 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -5277,7 +5277,7 @@ dump_do_dump_relocation (const uintptr_t dump_base,
if (installation_state == UNKNOWN)
{
Lisp_Object fname =
- concat2 (Vinvocation_directory, XCAR (comp_u->file));
+ Fexpand_file_name (XCAR (comp_u->file), Vinvocation_directory);
FILE *file;
if ((file = emacs_fopen (SSDATA (ENCODE_FILE (fname)), "r")))
{
@@ -5293,9 +5293,9 @@ dump_do_dump_relocation (const uintptr_t dump_base,
}
comp_u->file =
- concat2 (Vinvocation_directory,
- installation_state == INSTALLED
- ? XCAR (comp_u->file) : XCDR (comp_u->file));
+ Fexpand_file_name (installation_state == INSTALLED
+ ? XCAR (comp_u->file) : XCDR (comp_u->file),
+ Vinvocation_directory);
comp_u->handle = dynlib_open (SSDATA (comp_u->file));
if (!comp_u->handle)
error ("%s", dynlib_error ());
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- feature/native-comp 6568198: * src/pdumper.c (dump_do_dump_relocation): Use `expand-file-name'.,
Andrea Corallo <=