From 212df36327ce8aa60a94b118259183315f8900d3 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 27 Apr 2008 01:17:03 +0000 Subject: [PATCH] =?utf8?q?Johan=20Bockg=EF=BF=BD=20=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit (byte-compile-find-cl-functions): Simplify. Collect `defun' and `autoload' entries. Avoid modifying load-history. --- lisp/ChangeLog | 6 ++++++ lisp/emacs-lisp/bytecomp.el | 12 +++--------- 2 files changed, 9 insertions(+), 9 deletions(-) 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 + + * emacs-lisp/bytecomp.el (byte-compile-find-cl-functions): + Simplify. Collect `defun' and `autoload' entries. Avoid + modifying load-history. + 2008-04-26 Glenn Morris * 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." -- 2.39.2