From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Simplify init_lread() branch and fix comments Date: Wed, 28 Dec 2016 09:52:56 +0100 Message-ID: References: <87h95ou58j.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1482915193 10660 195.159.176.226 (28 Dec 2016 08:53:13 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 28 Dec 2016 08:53:13 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.90 (gnu/linux) Cc: emacs-devel@gnu.org To: Chris Gregory Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 28 09:53:10 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 1cM9yr-0001zF-SL for ged-emacs-devel@m.gmane.org; Wed, 28 Dec 2016 09:53:06 +0100 Original-Received: from localhost ([::1]:58281 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cM9yw-00025b-I7 for ged-emacs-devel@m.gmane.org; Wed, 28 Dec 2016 03:53:10 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33604) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cM9yp-00025K-QF for emacs-devel@gnu.org; Wed, 28 Dec 2016 03:53:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cM9ym-0002Wr-PK for emacs-devel@gnu.org; Wed, 28 Dec 2016 03:53:03 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.10]:35957) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cM9ym-0002Wk-IE for emacs-devel@gnu.org; Wed, 28 Dec 2016 03:53:00 -0500 Original-Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 3tpRMZ54Knz3hrZ7; Wed, 28 Dec 2016 09:52:58 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3tpRMZ4ly8zvkDL; Wed, 28 Dec 2016 09:52:58 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id yIxz4kA1INMh; Wed, 28 Dec 2016 09:52:57 +0100 (CET) X-Auth-Info: pqNJ8FSSA3u3/nms/4Sw7ABdC4TPvyv7eeMUGAUOdda230CKEU5Zh8K3n+9jbKLp Original-Received: from linux.local (ppp-88-217-8-223.dynamic.mnet-online.de [88.217.8.223]) by mail.mnet-online.de (Postfix) with ESMTPA; Wed, 28 Dec 2016 09:52:57 +0100 (CET) Original-Received: by linux.local (Postfix, from userid 501) id 3358F1E5468; Wed, 28 Dec 2016 09:52:57 +0100 (CET) X-Yow: .. does your DRESSING ROOM have enough ASPARAGUS? In-Reply-To: <87h95ou58j.fsf@gmail.com> (Chris Gregory's message of "Tue, 27 Dec 2016 21:01:16 -0600") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 212.18.0.10 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:210879 Archived-At: On Dez 27 2016, Chris Gregory wrote: > 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. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."