Mercurial > emacs
changeset 88870:4b1cc2afc2c8
(Fload) <!load_dangerous_libraries>: Don't leak fd.
<version == 20>: Refuse to load.
| author | Dave Love <fx@gnu.org> |
|---|---|
| date | Thu, 18 Jul 2002 16:30:36 +0000 |
| parents | b26b42483aeb |
| children | ce44b8f7d67b |
| files | src/lread.c |
| diffstat | 1 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lread.c Thu Jul 18 11:09:38 2002 +0000 +++ b/src/lread.c Thu Jul 18 16:30:36 2002 +0000 @@ -758,8 +758,11 @@ { safe_p = 0; if (!load_dangerous_libraries) - error ("File `%s' was not compiled in Emacs", - XSTRING (found)->data); + { + emacs_close (fd); + error ("File `%s' was not compiled in Emacs", + XSTRING (found)->data); + } else if (!NILP (nomessage)) message_with_string ("File `%s' not compiled in Emacs", found, 1); } @@ -778,9 +781,15 @@ if (fd >= 0) emacs_close (fd); + /* load-with-code-conversion currently fails with + emacs-mule non-ASCII doc strings. */ + error ("Can't currently load Emacs 20/1-compiled files: %s", + XSTRING (found)->data); +#if 0 val = call4 (intern ("load-with-code-conversion"), found, file, NILP (noerror) ? Qnil : Qt, NILP (nomessage) ? Qnil : Qt); +#endif return unbind_to (count, val); }