]> git.eshelyaron.com Git - emacs.git/commitdiff
; Fix a recent change in pdumper.c
authorEli Zaretskii <eliz@gnu.org>
Sat, 19 Jan 2019 18:37:50 +0000 (20:37 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sat, 19 Jan 2019 18:37:50 +0000 (20:37 +0200)
* src/pdumper.c (Fpdumper_stats): Don't expand dump filename, as we don't
record the directory relative to which it was specified.

src/pdumper.c

index 1c49167e02bc155bdd3ccc34f843d710ab2fbe7c..19a21329b1ed94787530e1a2f60898bbc8928aa7 100644 (file)
@@ -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));
 }