2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 443a6f83208..c73d490c8ac 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-27  Richard M. Stallman  <rms@gnu.org>
+
+        * eval.c (do_autoload): Ignore elements of Vautoload_queue
+        where car is not symbol.
+
 2005-12-27  Kenichi Handa  <handa@m17n.org>
 
         * charset.c (lisp_string_width): Check multibyteness of STRING.
diff --git a/src/eval.c b/src/eval.c
index ba70412edaf..a6c58bc2425 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2069,7 +2069,7 @@ do_autoload (fundef, funname)
       second = Fcdr (first);
       first = Fcar (first);
 
-      if (CONSP (second) && EQ (XCAR (second), Qautoload))
+      if (SYMBOLP (first) && CONSP (second) && EQ (XCAR (second), Qautoload))
         Fput (first, Qautoload, (XCDR (second)));
 
       queue = XCDR (queue);