From 107215596c1a8edfb239a88850d822642bc0e4af Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 21 Mar 2019 17:55:16 +0200 Subject: [PATCH] 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 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); -- 2.39.5