From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Simplify init_lread() branch and fix comments Date: Wed, 28 Dec 2016 17:46:49 +0200 Message-ID: <83shp8ukd2.fsf@gnu.org> References: <87h95ou58j.fsf@gmail.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1482940290 19565 195.159.176.226 (28 Dec 2016 15:51:30 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 28 Dec 2016 15:51:30 +0000 (UTC) Cc: czipperz@gmail.com, emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 28 16:51:26 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cMGVZ-0003k3-7v for ged-emacs-devel@m.gmane.org; Wed, 28 Dec 2016 16:51:17 +0100 Original-Received: from localhost ([::1]:59758 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cMGVe-0005Ea-20 for ged-emacs-devel@m.gmane.org; Wed, 28 Dec 2016 10:51:22 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38433) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cMGRP-00028H-RC for emacs-devel@gnu.org; Wed, 28 Dec 2016 10:47:00 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cMGRN-00054n-74 for emacs-devel@gnu.org; Wed, 28 Dec 2016 10:46:59 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:41150) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cMGRN-00054j-4a; Wed, 28 Dec 2016 10:46:57 -0500 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:3767 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1cMGRM-0004U9-CJ; Wed, 28 Dec 2016 10:46:56 -0500 In-reply-to: (message from Andreas Schwab on Wed, 28 Dec 2016 09:52:56 +0100) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e 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:210891 Archived-At: > From: Andreas Schwab > Date: Wed, 28 Dec 2016 09:52:56 +0100 > Cc: emacs-devel@gnu.org > > > diff --git a/src/lread.c b/src/lread.c > > index 35348f1..23ebc8f 100644 > > --- a/src/lread.c > > +++ b/src/lread.c > > @@ -4430,17 +4430,13 @@ load_path_default (void) > > void > > init_lread (void) > > { > > - /* First, set Vload_path. */ > > - > > - /* Ignore EMACSLOADPATH when dumping. */ > > -#ifdef CANNOT_DUMP > > - bool use_loadpath = true; > > -#else > > - bool use_loadpath = NILP (Vpurify_flag); > > -#endif > > - > > - if (use_loadpath && egetenv ("EMACSLOADPATH")) > > + if ( > > +#ifndef CANNOT_DUMP > > + NILP (Vpurify_flag) && > > +#endif > > + egetenv ("EMACSLOADPATH")) > > { > > That makes it worse, and violates the GNU coding style. Agreed.