diff options
| author | Andrea Corallo | 2021-04-06 21:13:47 +0200 |
|---|---|---|
| committer | Andrea Corallo | 2021-04-06 21:13:47 +0200 |
| commit | 65681982134d973ee6bc78b627866e2ca4e242e7 (patch) | |
| tree | 05af013cb577881ddb94af324eca4f1aabb049a6 /src | |
| parent | b77575198c4395b9345ad6694d7fb1fe23aeace6 (diff) | |
| download | emacs-65681982134d973ee6bc78b627866e2ca4e242e7.tar.gz emacs-65681982134d973ee6bc78b627866e2ca4e242e7.zip | |
* src/pdumper.c (dump_do_dump_relocation): Use `expand-file-name'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/pdumper.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pdumper.c b/src/pdumper.c index e266b35ca67..9b750a33f36 100644 --- a/src/pdumper.c +++ b/src/pdumper.c | |||
| @@ -5277,7 +5277,7 @@ dump_do_dump_relocation (const uintptr_t dump_base, | |||
| 5277 | if (installation_state == UNKNOWN) | 5277 | if (installation_state == UNKNOWN) |
| 5278 | { | 5278 | { |
| 5279 | Lisp_Object fname = | 5279 | Lisp_Object fname = |
| 5280 | concat2 (Vinvocation_directory, XCAR (comp_u->file)); | 5280 | Fexpand_file_name (XCAR (comp_u->file), Vinvocation_directory); |
| 5281 | FILE *file; | 5281 | FILE *file; |
| 5282 | if ((file = emacs_fopen (SSDATA (ENCODE_FILE (fname)), "r"))) | 5282 | if ((file = emacs_fopen (SSDATA (ENCODE_FILE (fname)), "r"))) |
| 5283 | { | 5283 | { |
| @@ -5293,9 +5293,9 @@ dump_do_dump_relocation (const uintptr_t dump_base, | |||
| 5293 | } | 5293 | } |
| 5294 | 5294 | ||
| 5295 | comp_u->file = | 5295 | comp_u->file = |
| 5296 | concat2 (Vinvocation_directory, | 5296 | Fexpand_file_name (installation_state == INSTALLED |
| 5297 | installation_state == INSTALLED | 5297 | ? XCAR (comp_u->file) : XCDR (comp_u->file), |
| 5298 | ? XCAR (comp_u->file) : XCDR (comp_u->file)); | 5298 | Vinvocation_directory); |
| 5299 | comp_u->handle = dynlib_open (SSDATA (comp_u->file)); | 5299 | comp_u->handle = dynlib_open (SSDATA (comp_u->file)); |
| 5300 | if (!comp_u->handle) | 5300 | if (!comp_u->handle) |
| 5301 | error ("%s", dynlib_error ()); | 5301 | error ("%s", dynlib_error ()); |