# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1209259009 0
# Node ID a674a09b0ac8496116cafb6e2b2f8ece9d315275
# Parent  303153b94dbcb0a9736b520e00c39cf4e25de7d6
Johan Bockg?  <bojohan at gnu.org>

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

diff -r 303153b94dbc -r a674a09b0ac8 lisp/emacs-lisp/bytecomp.el
--- a/lisp/emacs-lisp/bytecomp.el	Sat Apr 26 21:37:57 2008 +0000
+++ b/lisp/emacs-lisp/bytecomp.el	Sun Apr 27 01:16:49 2008 +0000
@@ -1405,15 +1405,9 @@
       (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."