[Emacs-diffs] master 1072155: Avoid duplicate entries in process-environment after re-dumping

[Eli Zaretskii]

branch: master
commit 107215596c1a8edfb239a88850d822642bc0e4af
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Avoid duplicate entries in process-environment after re-dumping
    
    * src/pdumper.c (Fdump_emacs_portable): Reset
    process-environment to nil.  (Bug#34936)
---
 src/pdumper.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/pdumper.c b/src/pdumper.c
index fbf17d1..f459d97 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -4025,6 +4025,12 @@ types.  */)
   Lisp_Object symbol = intern ("command-line-processed");
   specbind (symbol, Qnil);
 
+  /* Reset process-environment -- this is for when they re-dump a
+     pdump-restored emacs, since set_initial_environment wants always
+     to cons it from scratch.  */
+  Vprocess_environment = Qnil;
+  garbage_collect ();
+
   CHECK_STRING (filename);
   filename = Fexpand_file_name (filename, Qnil);
   filename = ENCODE_FILE (filename);