From: Glenn Morris <rgm@gnu.org>
Date: Sun, 27 Apr 2008 01:17:03 +0000 (+0000)
Subject: Johan Bockg�  <bojohan at gnu.org>
X-Git-Tag: emacs-pretest-23.0.90~6015
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=212df36327ce8aa60a94b118259183315f8900d3;p=emacs.git

Johan Bockg�  <bojohan at gnu.org>

(byte-compile-find-cl-functions): Simplify.  Collect `defun' and
`autoload' entries.  Avoid modifying load-history.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e9ba1a706e6..55794b99016 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-27  Johan Bockgård  <bojohan@gnu.org>
+
+	* emacs-lisp/bytecomp.el (byte-compile-find-cl-functions):
+	Simplify.  Collect `defun' and `autoload' entries.  Avoid
+	modifying load-history.
+
 2008-04-26  Glenn Morris  <rgm@gnu.org>
 
 	* textmodes/ispell.el (ispell-insert-word): Revert previous change.
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index e54d1edf4d5..0249c0dc78c 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1405,15 +1405,9 @@ extra args."
       (when (and (stringp (car elt))
 		 (string-match
 		  "^cl\\>" (file-name-nondirectory (car elt))))
-	(setq byte-compile-cl-functions
-	      (append byte-compile-cl-functions
-		      (cdr elt)))))
-    (let ((tail byte-compile-cl-functions))
-      (while tail
-	(if (and (consp (car tail))
-		 (eq (car (car tail)) 'autoload))
-	    (setcar tail (cdr (car tail))))
-	(setq tail (cdr tail))))))
+	(dolist (e (cdr elt))
+          (when (memq (car-safe e) '(autoload defun))
+            (push (cdr e) byte-compile-cl-functions)))))))
 
 (defun byte-compile-cl-warn (form)
   "Warn if FORM is a call of a function from the CL package."