diff options
| author | Glenn Morris | 2013-11-24 17:35:45 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-11-24 17:35:45 -0800 |
| commit | 97bacf8c0530e5265db01fad127660a7ed33cfdb (patch) | |
| tree | c8ae80b827e1c308315285a5223b121a49d81b04 /src | |
| parent | 431dec313259cd2f868d4bea79e3a32279961eb7 (diff) | |
| download | emacs-97bacf8c0530e5265db01fad127660a7ed33cfdb.tar.gz emacs-97bacf8c0530e5265db01fad127660a7ed33cfdb.zip | |
* src/lread.c (init_lread): Fix 2013-11-23 goof that was checking
uninstalled dump_path against installed Vload_path.
Fixes: debbugs:15964
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2013-11-25 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * lread.c (init_lread): Fix 2013-11-23 goof that was checking | ||
| 4 | uninstalled dump_path against installed Vload_path. (Bug#15964) | ||
| 5 | |||
| 1 | 2013-11-24 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2013-11-24 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | Export get_pos_property to Elisp. | 8 | 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) | |||
| 4374 | } | 4374 | } |
| 4375 | else /* Vpurify_flag || !EMACSLOADPATH */ | 4375 | else /* Vpurify_flag || !EMACSLOADPATH */ |
| 4376 | { | 4376 | { |
| 4377 | Lisp_Object lpath = Vload_path; | ||
| 4377 | Vload_path = load_path_default (0); | 4378 | Vload_path = load_path_default (0); |
| 4378 | 4379 | ||
| 4379 | /* Check before adding site-lisp directories. | 4380 | /* Check before adding site-lisp directories. |
| @@ -4386,8 +4387,7 @@ init_lread (void) | |||
| 4386 | load-path has somehow already been changed (this can only be | 4387 | load-path has somehow already been changed (this can only be |
| 4387 | from a site-load file during dumping?) from the dumped value. | 4388 | from a site-load file during dumping?) from the dumped value. |
| 4388 | FIXME? Should we ignore any dump_path changes? */ | 4389 | FIXME? Should we ignore any dump_path changes? */ |
| 4389 | if (initialized && !no_site_lisp && | 4390 | if (initialized && !no_site_lisp && !NILP (Fequal (dump_path, lpath))) |
| 4390 | ! NILP (Fequal (dump_path, Vload_path))) | ||
| 4391 | { | 4391 | { |
| 4392 | Lisp_Object sitelisp; | 4392 | Lisp_Object sitelisp; |
| 4393 | sitelisp = decode_env_path (0, PATH_SITELOADSEARCH, 0); | 4393 | sitelisp = decode_env_path (0, PATH_SITELOADSEARCH, 0); |