diff options
| author | Andrea Corallo <akrl@sdf.org> | 2021-03-19 10:23:41 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2021-03-19 10:23:41 +0100 |
| commit | b3ad62f8a35617366886be2a86e8641282824adf (patch) | |
| tree | 138b6c1951e36dfe01b90a728c8ecd11399f1bba /src/w32.c | |
| parent | 3e133cc050926284109fe61f4789f67676491ffa (diff) | |
| download | emacs-b3ad62f8a35617366886be2a86e8641282824adf.tar.gz | |
Do not load native code when `load' is explicitly called on a .elc file
* src/lread.c (Fload): Do not load native code when `load' is
explicitly called on a .elc file.
(Flocate_file_internal): Update 'openp' call sites.
(maybe_swap_for_eln): Add new 'no_native' parameter.
(openp): Likewise + update 'maybe_swap_for_eln' and 'openp' call
sites.
* src/lisp.h: Update 'openp' signature.
* src/w32proc.c (sys_spawnve): Update 'openp' call sites.
* src/w32.c (check_windows_init_file): Likewise.
* src/sound.c (Fplay_sound_internal): Likewise.
* src/process.c (Fmake_process): Likewise.
* src/image.c (image_create_bitmap_from_file)
(image_find_image_fd): Likewise.
* src/emacs.c (set_invocation_vars): Likewise.
* src/charset.c (load_charset_map_from_file): Likewise.
* src/callproc.c (call_process): Likewise.
Diffstat (limited to 'src/w32.c')
| -rw-r--r-- | src/w32.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/w32.c b/src/w32.c index 14b8b11da00..467e6cb4271 100644 --- a/src/w32.c +++ b/src/w32.c @@ -10255,7 +10255,8 @@ check_windows_init_file (void) need to ENCODE_FILE here, but we do need to convert the file names from UTF-8 to ANSI. */ init_file = build_string ("term/w32-win"); - fd = openp (Vload_path, init_file, Fget_load_suffixes (), NULL, Qnil, 0); + fd = + openp (Vload_path, init_file, Fget_load_suffixes (), NULL, Qnil, 0, 0); if (fd < 0) { Lisp_Object load_path_print = Fprin1_to_string (Vload_path, Qnil); |