all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Chris Gregory <czipperz@gmail.com>
To: emacs-devel@gnu.org
Subject: Simplify init_lread() branch and fix comments
Date: Tue, 27 Dec 2016 21:01:16 -0600	[thread overview]
Message-ID: <87h95ou58j.fsf@gmail.com> (raw)

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.



             reply	other threads:[~2016-12-28  3:01 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-28  3:01 Chris Gregory [this message]
2016-12-28  8:52 ` Simplify init_lread() branch and fix comments Andreas Schwab
2016-12-28 15:46   ` Eli Zaretskii

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87h95ou58j.fsf@gmail.com \
    --to=czipperz@gmail.com \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.