[PATCH] Extra information in autoload error

[Alex <agrambot@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 138 bytes --]

I felt that the error that `autoload-do-load` throws when it runs into a
failed autoload is lacking, so I made the following adjustment:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: using Vload_history --]
[-- Type: text/x-diff, Size: 530 bytes --]

diff --git a/src/eval.c b/src/eval.c
index e08a25a..3c619ba 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1987,8 +1987,9 @@ it defines a macro.  */)
       Lisp_Object fun = Findirect_function (funname, Qnil);
 
       if (!NILP (Fequal (fun, fundef)))
-	error ("Autoloading failed to define function %s",
-	       SDATA (SYMBOL_NAME (funname)));
+	error ("Autoloading failed to define function %s in file %s",
+	       SDATA (SYMBOL_NAME (funname)),
+	       SDATA (Fcar (Fcar (Vload_history))));
       else
 	return fun;
     }

[-- Attachment #3: Type: text/plain, Size: 172 bytes --]




This should give the file that was checked for the autoload. I tested it
out and it seems to work. In case Vload_history can't be used, I also
tried out the following:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: patch using funname --]
[-- Type: text/x-diff, Size: 529 bytes --]

diff --git a/src/eval.c b/src/eval.c
index e08a25a..8a573de 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1987,8 +1987,9 @@ it defines a macro.  */)
       Lisp_Object fun = Findirect_function (funname, Qnil);
 
       if (!NILP (Fequal (fun, fundef)))
-	error ("Autoloading failed to define function %s",
-	       SDATA (SYMBOL_NAME (funname)));
+	error ("Autoloading failed to define function %s with filename %s",
+	       SDATA (SYMBOL_NAME (funname)),
+	       SDATA (Fcar (Fcdr (fundef))));
       else
 	return fun;
     }

[-- Attachment #5: Type: text/plain, Size: 120 bytes --]




Would one of these be considered for inclusion into Emacs? I think both
error messages are more helpful than before.