]> git.eshelyaron.com Git - emacs.git/commitdiff
Avoid duplicate entries in process-environment after re-dumping
authorEli Zaretskii <eliz@gnu.org>
Thu, 21 Mar 2019 15:55:16 +0000 (17:55 +0200)
committerEli Zaretskii <eliz@gnu.org>
Thu, 21 Mar 2019 15:55:16 +0000 (17:55 +0200)
* src/pdumper.c (Fdump_emacs_portable): Reset
process-environment to nil.  (Bug#34936)

src/pdumper.c

index fbf17d1629eb808043e4e032ad4639cf8dfa87bb..f459d971c353dc6b86b302f883015103ac67fa56 100644 (file)
@@ -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);