diff options
| author | Eli Zaretskii | 2021-04-18 16:44:44 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2021-04-18 16:44:44 +0300 |
| commit | 490b8c2c339966886190fdf897e2d95fb4bb5e3b (patch) | |
| tree | d4b97ac0e6e8651c0c9d9addf96462cc5adb29b0 /src | |
| parent | cc2d2e8d6c7d52d2fbbf9ffe410f97952c64cb3e (diff) | |
| download | emacs-490b8c2c339966886190fdf897e2d95fb4bb5e3b.tar.gz emacs-490b8c2c339966886190fdf897e2d95fb4bb5e3b.zip | |
* src/comp.c (fixup_eln_load_path): Simplify code.
Diffstat (limited to 'src')
| -rw-r--r-- | src/comp.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/comp.c b/src/comp.c index 50947316df8..5309be46dec 100644 --- a/src/comp.c +++ b/src/comp.c | |||
| @@ -4760,14 +4760,12 @@ fixup_eln_load_path (Lisp_Object eln_filename) | |||
| 4760 | if (CONSP (tem)) | 4760 | if (CONSP (tem)) |
| 4761 | last_cell = tem; | 4761 | last_cell = tem; |
| 4762 | 4762 | ||
| 4763 | const char preloaded[] = "preloaded"; | 4763 | const char preloaded[] = "/preloaded/"; |
| 4764 | ptrdiff_t preloaded_len = sizeof (preloaded) - 1; | ||
| 4765 | Lisp_Object eln_cache_sys = Ffile_name_directory (eln_filename); | 4764 | Lisp_Object eln_cache_sys = Ffile_name_directory (eln_filename); |
| 4766 | bool preloaded_p = | 4765 | const char *p_preloaded = |
| 4767 | !NILP (Fequal (Fsubstring_no_properties (eln_cache_sys, | 4766 | SSDATA (eln_cache_sys) + SBYTES (eln_cache_sys) - sizeof (preloaded) + 1; |
| 4768 | make_fixnum (-preloaded_len - 1), | 4767 | bool preloaded_p = strcmp (p_preloaded, preloaded) == 0; |
| 4769 | make_fixnum (-1)), | 4768 | |
| 4770 | build_string (preloaded))); | ||
| 4771 | /* One or two directories up... */ | 4769 | /* One or two directories up... */ |
| 4772 | for (int i = 0; i < (preloaded_p ? 2 : 1); i++) | 4770 | for (int i = 0; i < (preloaded_p ? 2 : 1); i++) |
| 4773 | eln_cache_sys = | 4771 | eln_cache_sys = |