From 07a0bda3c9ca05fb3e3f7c232d28410247d83df0 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Fri, 18 Nov 1994 16:43:04 +0000 Subject: [PATCH] (Fload): Call Fsubstitute_in_file_name after trying handler. --- src/lread.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lread.c b/src/lread.c index c08e5fc8c1a..a753eb91868 100644 --- a/src/lread.c +++ b/src/lread.c @@ -361,13 +361,17 @@ Return t if file exists.") #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) -- 2.39.5