From 97bacf8c0530e5265db01fad127660a7ed33cfdb Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 24 Nov 2013 17:35:45 -0800 Subject: [PATCH] * src/lread.c (init_lread): Fix 2013-11-23 goof that was checking uninstalled dump_path against installed Vload_path. Fixes: debbugs:15964 --- src/ChangeLog | 5 +++++ src/lread.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 0818cb01156..a0b0bb2b2a8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2013-11-25 Glenn Morris + + * lread.c (init_lread): Fix 2013-11-23 goof that was checking + uninstalled dump_path against installed Vload_path. (Bug#15964) + 2013-11-24 Stefan Monnier Export get_pos_property to Elisp. diff --git a/src/lread.c b/src/lread.c index eaf1f818c43..1f49be6e361 100644 --- a/src/lread.c +++ b/src/lread.c @@ -4374,6 +4374,7 @@ init_lread (void) } else /* Vpurify_flag || !EMACSLOADPATH */ { + Lisp_Object lpath = Vload_path; Vload_path = load_path_default (0); /* Check before adding site-lisp directories. @@ -4386,8 +4387,7 @@ init_lread (void) load-path has somehow already been changed (this can only be from a site-load file during dumping?) from the dumped value. FIXME? Should we ignore any dump_path changes? */ - if (initialized && !no_site_lisp && - ! NILP (Fequal (dump_path, Vload_path))) + if (initialized && !no_site_lisp && !NILP (Fequal (dump_path, lpath))) { Lisp_Object sitelisp; sitelisp = decode_env_path (0, PATH_SITELOADSEARCH, 0); -- 2.39.2