From: Lute Kamstra <lute@gnu.org>
Date: Thu, 28 Apr 2005 08:38:35 +0000 (+0000)
Subject: (do_autoload): Record only autoloads in the autoload property of symbols.
X-Git-Tag: ttn-vms-21-2-B4~689
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f4cfd81af9ca9e0339171af9dff795610e268aea;p=emacs.git

(do_autoload): Record only autoloads in the autoload property of symbols.
---

diff --git a/src/eval.c b/src/eval.c
index 8700ca222ce..6832f3197ad 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1,6 +1,6 @@
 /* Evaluator for GNU Emacs Lisp interpreter.
-   Copyright (C) 1985, 86, 87, 93, 94, 95, 99, 2000, 2001, 02, 2004
-     Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1999, 2000, 2001,
+     2002, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -1982,10 +1982,7 @@ do_autoload (fundef, funname)
       second = Fcdr (first);
       first = Fcar (first);
 
-      /* Note: This test is subtle.  The cdr of an autoload-queue entry
-	 may be an atom if the autoload entry was generated by a defalias
-	 or fset.  */
-      if (CONSP (second))
+      if (CONSP (second) && EQ (XCAR (second), Qautoload))
 	Fput (first, Qautoload, (XCDR (second)));
 
       queue = XCDR (queue);