From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 19 Jan 2019 18:37:50 +0000 (+0200)
Subject: ; Fix a recent change in pdumper.c
X-Git-Tag: emacs-27.0.90~3779
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b821a70cb9467186afb55734a0e5cb4601909916;p=emacs.git

; Fix a recent change in pdumper.c

* src/pdumper.c (Fpdumper_stats): Don't expand dump filename, as we don't
record the directory relative to which it was specified.
---

diff --git a/src/pdumper.c b/src/pdumper.c
index 1c49167e02b..19a21329b1e 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -5581,18 +5581,21 @@ Value is nil if this session was not started using a portable dump file.*/)
 #ifdef WINDOWSNT
   char dump_fn_utf8[MAX_UTF8_PATH];
   if (filename_from_ansi (dump_private.dump_filename, dump_fn_utf8) == 0)
-    dump_fn = DECODE_FILE (build_unibyte_string (dump_fn_utf8));
+    {
+      dostounix_filename (dump_fn_utf8);
+      dump_fn = DECODE_FILE (build_unibyte_string (dump_fn_utf8));
+    }
   else
     dump_fn = build_unibyte_string (dump_private.dump_filename);
 #else
   dump_fn = DECODE_FILE (build_unibyte_string (dump_private.dump_filename));
 #endif
 
-  dump_fn = Fexpand_file_name (dump_fn, Qnil);
-
   return CALLN (Flist,
 		Fcons (Qdumped_with_pdumper, Qt),
 		Fcons (Qload_time, make_float (dump_private.load_time)),
+		/* FIXME: dump_fn should be expanded relative to the
+		   original pwd where Emacs started.  */
 		Fcons (Qdump_file_name, dump_fn));
 }