[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Simplify init_lread() branch and fix comments
From: |
Chris Gregory |
Subject: |
Simplify init_lread() branch and fix comments |
Date: |
Tue, 27 Dec 2016 21:01:16 -0600 |
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.
- Simplify init_lread() branch and fix comments,
Chris Gregory <=