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/charset.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/charset.c')
| -rw-r--r-- | src/charset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/charset.c b/src/charset.c index eb388d1868b..7cd0fa78f04 100644 --- a/src/charset.c +++ b/src/charset.c @@ -486,7 +486,7 @@ load_charset_map_from_file (struct charset *charset, Lisp_Object mapfile, ptrdiff_t count = SPECPDL_INDEX (); record_unwind_protect_nothing (); specbind (Qfile_name_handler_alist, Qnil); - fd = openp (Vcharset_map_path, mapfile, suffixes, NULL, Qnil, false); + fd = openp (Vcharset_map_path, mapfile, suffixes, NULL, Qnil, false, false); fp = fd < 0 ? 0 : fdopen (fd, "r"); if (!fp) { |