aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2019-03-21 17:55:16 +0200
committerEli Zaretskii2019-03-21 17:55:16 +0200
commit107215596c1a8edfb239a88850d822642bc0e4af (patch)
treec0abe35a3b3cfee61fe793feb7684a0cdf3bce00 /src
parentc569cceb2d334564d320d2b4098c855db7eb88a0 (diff)
downloademacs-107215596c1a8edfb239a88850d822642bc0e4af.tar.gz
emacs-107215596c1a8edfb239a88850d822642bc0e4af.zip
Avoid duplicate entries in process-environment after re-dumping
* src/pdumper.c (Fdump_emacs_portable): Reset process-environment to nil. (Bug#34936)
Diffstat (limited to 'src')
-rw-r--r--src/pdumper.c6
1 files changed, 6 insertions, 0 deletions
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. */)
4025 Lisp_Object symbol = intern ("command-line-processed"); 4025 Lisp_Object symbol = intern ("command-line-processed");
4026 specbind (symbol, Qnil); 4026 specbind (symbol, Qnil);
4027 4027
4028 /* Reset process-environment -- this is for when they re-dump a
4029 pdump-restored emacs, since set_initial_environment wants always
4030 to cons it from scratch. */
4031 Vprocess_environment = Qnil;
4032 garbage_collect ();
4033
4028 CHECK_STRING (filename); 4034 CHECK_STRING (filename);
4029 filename = Fexpand_file_name (filename, Qnil); 4035 filename = Fexpand_file_name (filename, Qnil);
4030 filename = ENCODE_FILE (filename); 4036 filename = ENCODE_FILE (filename);