From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 21 Mar 2019 15:55:16 +0000 (+0200)
Subject: Avoid duplicate entries in process-environment after re-dumping
X-Git-Tag: emacs-27.0.90~3376
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=107215596c1a8edfb239a88850d822642bc0e4af;p=emacs.git

Avoid duplicate entries in process-environment after re-dumping

* src/pdumper.c (Fdump_emacs_portable): Reset
process-environment to nil.  (Bug#34936)
---

diff --git a/src/pdumper.c b/src/pdumper.c
index fbf17d1629e..f459d971c35 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);