Mercurial > emacs
changeset 10014:d149c4dc84f3
(Fload): Call Fsubstitute_in_file_name after trying handler.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Fri, 18 Nov 1994 16:43:04 +0000 |
| parents | fd7810a1535a |
| children | f6c7d1ab2d6a |
| files | src/lread.c |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lread.c Fri Nov 18 16:41:07 1994 +0000 +++ b/src/lread.c Fri Nov 18 16:43:04 1994 +0000 @@ -361,13 +361,17 @@ #endif /* DOS_NT */ CHECK_STRING (str, 0); - str = Fsubstitute_in_file_name (str); /* If file name is magic, call the handler. */ handler = Ffind_file_name_handler (str, Qload); if (!NILP (handler)) return call5 (handler, Qload, str, noerror, nomessage, nosuffix); + /* Do this after the handler to avoid + the need to gcpro noerror, nomessage and nosuffix. + (Below here, we care only whether they are nil or not.) */ + str = Fsubstitute_in_file_name (str); + /* Avoid weird lossage with null string as arg, since it would try to load a directory as a Lisp file */ if (XSTRING (str)->size > 0)