(byte-compile-cl-warn): Avoid cl warnings

from caaar & al.

2 files changed, 15 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 580acb66b1d..00461c40769 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-28  Dave Love  <fx@gnu.org>
+
+        * emacs-lisp/bytecomp.el (byte-compile-cl-warn): Avoid cl warnings
+        from caaar & al.
+
 2003-04-28  Kenichi Handa  <handa@m17n.org>
 
         * international/mule-cmds.el (reset-language-environment): Raise
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index ade83aa0f41..7af112e6918 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -10,7 +10,7 @@
 
 ;;; This version incorporates changes up to version 2.10 of the
 ;;; Zawinski-Furuseth compiler.
-(defconst byte-compile-version "$Revision: 2.129 $")
+(defconst byte-compile-version "$Revision: 2.130 $")
 
 ;; This file is part of GNU Emacs.
 
@@ -1264,7 +1264,15 @@ Each function's symbol gets marked with the `byte-compile-noruntime' property."
                           ;; These would sometimes be warned about
                           ;; but such warnings are never useful,
                           ;; so don't warn about them.
-                          macroexpand cl-macroexpand-all cl-compiling-file))))
+                          macroexpand cl-macroexpand-all
+                          cl-compiling-file)))
+             ;; Avoid warnings for things which are safe because they
+             ;; have suitable compiler macros, but those aren't
+             ;; expanded at this stage.  There should probably be more
+             ;; here than caaar and friends.
+             (not (and (eq (get func 'byte-compile)
+                           'cl-byte-compile-compiler-macro)
+                       (match-string "\\`c[ad]+r\\'" (symbol-name func)))))
         (byte-compile-warn "Function `%s' from cl package called at runtime"
                            func)))
   form)