From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Chris Gregory Newsgroups: gmane.emacs.devel Subject: Simplify init_lread() branch and fix comments Date: Tue, 27 Dec 2016 21:01:16 -0600 Message-ID: <87h95ou58j.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1482894119 31348 195.159.176.226 (28 Dec 2016 03:01:59 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 28 Dec 2016 03:01:59 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 28 04:01:54 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 1cM4Uz-0007BO-Cn for ged-emacs-devel@m.gmane.org; Wed, 28 Dec 2016 04:01:53 +0100 Original-Received: from localhost ([::1]:57118 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cM4V2-0002XF-Ol for ged-emacs-devel@m.gmane.org; Tue, 27 Dec 2016 22:01:56 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46674) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cM4UT-0002X8-LP for emacs-devel@gnu.org; Tue, 27 Dec 2016 22:01:22 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cM4UT-0002q9-1U for emacs-devel@gnu.org; Tue, 27 Dec 2016 22:01:21 -0500 Original-Received: from mail-io0-x243.google.com ([2607:f8b0:4001:c06::243]:36121) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cM4US-0002pl-Nn for emacs-devel@gnu.org; Tue, 27 Dec 2016 22:01:20 -0500 Original-Received: by mail-io0-x243.google.com with SMTP id m204so9792960ioe.3 for ; Tue, 27 Dec 2016 19:01:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=x+jECrPLP40Yi/z+JV3uLJuAmgRFO22YQGTXlC6LdoQ=; b=XxO015BLqakYdDRuKXOqFm/6MZhfpuoXQrwhmFPnDBj849jTJtxm29c3X4Z6GpwoFL zD0LhYlP0gDz/JjPy7gCEDNHHNGTeEbVSgr5tN/7aZg1ALsINFEsSNXCTTlNK9TdcAOR FXpus2p5Phbz6486aNAW08LdS9tR+01cRQhDJUTbJrRnGFkp1UQBfjSaWZXGsA4D/AFs YIIvRn/2iQj/8ORgZPdT6Z1b5tuoy8F8OLMwmQ+s9FmRO8C+5gU9uOAbWsH7c87+3t0O Sk3Pyz8fQLJ1r6f9qgbs8Ab2utaR3UXYAIGQACvSPfMGTcyRjNOSMPyEolybxxL22lOq WB6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=x+jECrPLP40Yi/z+JV3uLJuAmgRFO22YQGTXlC6LdoQ=; b=F+nibJvFQenEvmqYNq75jj84z8im5TnwdH8gDCaD5yR14LXKBr780upMtVOA69HUSP iwItK4R+EFvCF9G36zfepWMC4VLj5TsHAgkdKv8ZER1HhVBpOnN2hWVs5xK+yZjpwCLj C4zX5wzsa0tcjXGLwqy35J4VpYyMsnQ82W0/OmMqk08sV/eXAwxePh6rsKyvkgQFPu+y wKpbijeVSbu8qN5lltJK7lK0L0PTY98TXRbP5ZjmY8n1cq+Ri0TIJ9doQMCA0JIhtS+L AvK2kYLCTnQmz1BhN8zkJ7etkKfifgWcY828Ey+1/Ey+xXU9Laf2i5TnppmaUKutU+Kd yeeA== X-Gm-Message-State: AIkVDXJbVasIFana+jNTLl7i3iksE2nDfG1iB8BkefB4Z0AQFPSMNBachkQHG7zu5UnL2A== X-Received: by 10.107.164.159 with SMTP id d31mr23845611ioj.182.1482894078234; Tue, 27 Dec 2016 19:01:18 -0800 (PST) Original-Received: from CzipperZag ([2604:2d80:8039:81de:a0b5:3d06:3bb2:d546]) by smtp.gmail.com with ESMTPSA id 35sm8415257iot.6.2016.12.27.19.01.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Dec 2016 19:01:17 -0800 (PST) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4001:c06::243 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:210861 Archived-At: This patch moves the comments before the branch in init_lread() to the correct locations, and simplifies the branch because (true && a) == a. -- Chris Gregory Diff: 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")) { + /* First, set Vload_path. */ Vload_path = decode_env_path ("EMACSLOADPATH", 0, 1); /* Check (non-nil) user-supplied elements. */ @@ -4479,6 +4475,7 @@ init_lread (void) } else { + /* Ignore EMACSLOADPATH when dumping. */ Vload_path = load_path_default (); /* Check before adding site-lisp directories.