From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: "Daniel Colascione" Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] master 1072155: Avoid duplicate entries in process-environment after re-dumping Date: Tue, 2 Apr 2019 12:02:55 -0700 Message-ID: <892097f7bc3f5e0ac88d31c60e0bed59.squirrel@dancol.org> References: <20190321155613.6127.22574@vcs0.savannah.gnu.org> <20190321155614.E6343209B2@vcs0.savannah.gnu.org> Mime-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="74474"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: SquirrelMail/1.4.23 [SVN] To: emacs-devel@gnu.org, "Eli Zaretskii" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 02 21:03:48 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hBOhG-000JDg-Dl for ged-emacs-devel@m.gmane.org; Tue, 02 Apr 2019 21:03:47 +0200 Original-Received: from localhost ([127.0.0.1]:39219 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hBOhF-0003yB-CW for ged-emacs-devel@m.gmane.org; Tue, 02 Apr 2019 15:03:45 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:45153) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hBOgY-0003w5-JJ for emacs-devel@gnu.org; Tue, 02 Apr 2019 15:03:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hBOgW-0003cJ-Jw for emacs-devel@gnu.org; Tue, 02 Apr 2019 15:03:02 -0400 Original-Received: from dancol.org ([2600:3c01::f03c:91ff:fedf:adf3]:44900) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hBOgU-0003Z0-OK; Tue, 02 Apr 2019 15:03:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=dancol.org; s=x; h=Content-Transfer-Encoding:Content-Type:MIME-Version:To:From:Subject:Date:References:In-Reply-To:Message-ID; bh=vDpoMvBLtYB4k6ej08yQRbjTLDWbNCfve+x6WcD7BGc=; b=NPK35g1R8ywdb4WiiLOHY4ju5VkYR7NJ2d8KJHtBjQ51GGZ155xgl6uAsC6yBPXKYOwxL0/JtnJMDcdvPnta8AIwG5iyU/vQ2iJ73NaZpPCNaeiij/OW2IM2psnN+NBLGVAh8iYT+W1fWuXoMi4wPlLw+qBPGpN0adCQulaYeatSX7ioIZmXx0t8Bkbl0avqZduI4KfDRMH+BgzY1AmmI6c+tizggQDoyqBEDlUvWfnWQuEWat99j1cBdONbQAjX7TuYKmwSlkDvaXVur6F9uDTFe/GqHonpMr9xcj60G2YRVSE9Kn33kQW3PV3oBqkgBgS9q+qXafxSi1jmJwGYMA==; Original-Received: from localhost ([127.0.0.1] helo=dancol.org) by dancol.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hBOgR-00062F-Fj; Tue, 02 Apr 2019 12:02:55 -0700 Original-Received: from 127.0.0.1 (SquirrelMail authenticated user dancol) by dancol.org with HTTP; Tue, 2 Apr 2019 12:02:55 -0700 In-Reply-To: <20190321155614.E6343209B2@vcs0.savannah.gnu.org> X-Priority: 3 (Normal) Importance: Normal X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2600:3c01::f03c:91ff:fedf:adf3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:234891 Archived-At: > branch: master > commit 107215596c1a8edfb239a88850d822642bc0e4af > Author: Eli Zaretskii > Commit: Eli Zaretskii > > 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; Don't we want to reset process-environment to its old value in dump_unwind_cleanup? > + garbage_collect (); > + > CHECK_STRING (filename); > filename = Fexpand_file_name (filename, Qnil); > filename = ENCODE_FILE (filename); Does it make sense to move this chunk before the garbage-collect-until-we-run-all-finalizers loop above? That way, we'd run one fewer GC.